aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-02-07 14:29:53 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-02-07 14:29:53 -0800
commit24e1d1b5b5ff506904493ca3bacc464f2f059866 (patch)
treeed6e38223c77bc2fa48b914e407b205a437c3a5b /usb
parent6270aa63b3ee5dcf78aa915719a0425bbee176ee (diff)
downloadpatches-24e1d1b5b5ff506904493ca3bacc464f2f059866.tar.gz
more patches added
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-add-support-for-ochi-on-at91rm9200.patch2
-rw-r--r--usb/usb-gotemp.patch2
-rw-r--r--usb/usb-zero-driver-removed-duplicated-code.patch30
-rw-r--r--usb/usbip.patch2
4 files changed, 33 insertions, 3 deletions
diff --git a/usb/usb-add-support-for-ochi-on-at91rm9200.patch b/usb/usb-add-support-for-ochi-on-at91rm9200.patch
index 945b88cbe20770..14fc474e190049 100644
--- a/usb/usb-add-support-for-ochi-on-at91rm9200.patch
+++ b/usb/usb-add-support-for-ochi-on-at91rm9200.patch
@@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+obj-$(CONFIG_USB_OHCI_AT91) += host/
obj-$(CONFIG_USB_ACM) += class/
- obj-$(CONFIG_USB_AUDIO) += class/
+ obj-$(CONFIG_USB_PRINTER) += class/
--- /dev/null
+++ gregkh-2.6/drivers/usb/host/ohci-at91.c
@@ -0,0 +1,306 @@
diff --git a/usb/usb-gotemp.patch b/usb/usb-gotemp.patch
index 030eb51d557c7a..15b86c93073754 100644
--- a/usb/usb-gotemp.patch
+++ b/usb/usb-gotemp.patch
@@ -331,7 +331,7 @@
+MODULE_LICENSE("GPL");
--- gregkh-2.6.orig/drivers/usb/Makefile
+++ gregkh-2.6/drivers/usb/Makefile
-@@ -68,6 +68,7 @@ obj-$(CONFIG_USB_AUERSWALD) += misc/
+@@ -67,6 +67,7 @@ obj-$(CONFIG_USB_AUERSWALD) += misc/
obj-$(CONFIG_USB_CYTHERM) += misc/
obj-$(CONFIG_USB_EMI26) += misc/
obj-$(CONFIG_USB_EMI62) += misc/
diff --git a/usb/usb-zero-driver-removed-duplicated-code.patch b/usb/usb-zero-driver-removed-duplicated-code.patch
new file mode 100644
index 00000000000000..bf06e88e13a4f9
--- /dev/null
+++ b/usb/usb-zero-driver-removed-duplicated-code.patch
@@ -0,0 +1,30 @@
+From linux-usb-devel-admin@lists.sourceforge.net Tue Feb 7 00:07:07 2006
+Message-ID: <cda58cb80602070006k29e9ea67v@mail.gmail.com>
+From: Franck Bui-Huu <vagabon.xyz@gmail.com>
+Cc: David Brownell <david-b@pacbell.net>, Alan Stern <stern@rowland.harvard.edu>
+Content-Disposition: inline
+Subject: USB: Zero driver: Removed duplicated code
+Date: Tue, 7 Feb 2006 09:06:17 +0100
+
+Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
+
+
+---
+ drivers/usb/gadget/zero.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/gadget/zero.c
++++ gregkh-2.6/drivers/usb/gadget/zero.c
+@@ -1224,12 +1224,6 @@ autoconf_fail:
+ loopback_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+ }
+
+- if (gadget->is_otg) {
+- otg_descriptor.bmAttributes |= USB_OTG_HNP,
+- source_sink_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+- loopback_config.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+- }
+-
+ usb_gadget_set_selfpowered (gadget);
+
+ init_timer (&dev->resume);
diff --git a/usb/usbip.patch b/usb/usbip.patch
index dd3300ec31c610..07ed5eb95fc8ce 100644
--- a/usb/usbip.patch
+++ b/usb/usbip.patch
@@ -82,8 +82,8 @@ a link to the userspace tools needed to get this to work.
+obj-$(CONFIG_USB_IP) += ip/
+
obj-$(CONFIG_USB_ACM) += class/
- obj-$(CONFIG_USB_AUDIO) += class/
obj-$(CONFIG_USB_PRINTER) += class/
+
--- /dev/null
+++ gregkh-2.6/drivers/usb/ip/Makefile
@@ -0,0 +1,13 @@