diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-13 16:32:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-13 16:32:36 -0700 |
| commit | f71299d9cd21ffd04dbaea7cf95a6a565363f5fa (patch) | |
| tree | abbb67d20eb2631c450dbc6cfe1fe40c9db4fe9a /usb.current | |
| parent | 2bb40f7012cfea87bb60cbc535a9dad192b993b7 (diff) | |
| download | patches-f71299d9cd21ffd04dbaea7cf95a6a565363f5fa.tar.gz | |
2.6.27-rc3 sync
Diffstat (limited to 'usb.current')
| -rw-r--r-- | usb.current/usb-add-musb-and-tusb-support.patch | 2 | ||||
| -rw-r--r-- | usb.current/usb-auerswald-remove-driver.patch | 2 | ||||
| -rw-r--r-- | usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/usb.current/usb-add-musb-and-tusb-support.patch b/usb.current/usb-add-musb-and-tusb-support.patch index 9d90a94a8d18bf..683a027c9fbe3f 100644 --- a/usb.current/usb-add-musb-and-tusb-support.patch +++ b/usb.current/usb-add-musb-and-tusb-support.patch @@ -15915,7 +15915,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#endif /* OMAP2 */ --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2914,6 +2914,12 @@ M: jirislaby@gmail.com +@@ -2928,6 +2928,12 @@ M: jirislaby@gmail.com L: linux-kernel@vger.kernel.org S: Maintained diff --git a/usb.current/usb-auerswald-remove-driver.patch b/usb.current/usb-auerswald-remove-driver.patch index 63db4f1b1395b9..3dcda14f6c2d62 100644 --- a/usb.current/usb-auerswald-remove-driver.patch +++ b/usb.current/usb-auerswald-remove-driver.patch @@ -2278,7 +2278,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> obj-$(CONFIG_USB_CYTHERM) += cytherm.o --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -4181,12 +4181,6 @@ M: oliver@neukum.name +@@ -4195,12 +4195,6 @@ M: oliver@neukum.name L: linux-usb@vger.kernel.org S: Maintained diff --git a/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch b/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch index 2bf23bb9904580..f2bcb7cd70bea0 100644 --- a/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch +++ b/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch @@ -19,9 +19,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +++ b/drivers/usb/gadget/omap_udc.c @@ -54,6 +54,7 @@ - #include <asm/arch/dma.h> - #include <asm/arch/usb.h> -+#include <asm/arch/control.h> + #include <mach/dma.h> + #include <mach/usb.h> ++#include <mach/control.h> #include "omap_udc.h" |