aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-04-29 15:27:40 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-29 15:27:40 -0700
commit027449812d45e32d9eaa2f19f43ecf27d983c48d (patch)
treedbe6991bae624062795127077d56654d6ce9ab8b /usb
parent2de09971da57e908bdccb050ffcb54ff27966804 (diff)
downloadpatches-027449812d45e32d9eaa2f19f43ecf27d983c48d.tar.gz
2.6.25-git14 resync
Diffstat (limited to 'usb')
-rw-r--r--usb/c67x00-2-core.patch30
1 files changed, 15 insertions, 15 deletions
diff --git a/usb/c67x00-2-core.patch b/usb/c67x00-2-core.patch
index 68084ca8501ee0..8cdf8f34431603 100644
--- a/usb/c67x00-2-core.patch
+++ b/usb/c67x00-2-core.patch
@@ -26,6 +26,21 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
include/linux/usb/c67x00.h | 48 ++++++++
3 files changed, 284 insertions(+)
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -4028,6 +4028,12 @@ L: linux-usb@vger.kernel.org
+ S: Maintained
+ W: http://www.kroah.com/linux-usb/
+
++USB CYPRESS C67X00 DRIVER
++P: Peter Korsgaard
++M: jacmet@sunsite.dk
++L: linux-usb@vger.kernel.org
++S: Maintained
++
+ USB DAVICOM DM9601 DRIVER
+ P: Peter Korsgaard
+ M: jacmet@sunsite.dk
--- /dev/null
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -0,0 +1,230 @@
@@ -310,18 +325,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+};
+
+#endif /* _LINUX_USB_C67X00_H */
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -4027,6 +4027,12 @@ L: linux-usb@vger.kernel.org
- S: Maintained
- W: http://www.kroah.com/linux-usb/
-
-+USB CYPRESS C67X00 DRIVER
-+P: Peter Korsgaard
-+M: jacmet@sunsite.dk
-+L: linux-usb@vger.kernel.org
-+S: Maintained
-+
- USB DAVICOM DM9601 DRIVER
- P: Peter Korsgaard
- M: jacmet@sunsite.dk