diff options
author | John Crispin <john@openwrt.org> | 2011-09-26 09:35:02 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2011-09-26 09:35:02 +0000 |
commit | cf59e7255dff4020c397f375fd62f15df955f5d2 (patch) | |
tree | 2218e4171f371926b919a798d46ff949dcceac48 /target/linux/lantiq/patches-3.0/440-dwc_otg.patch | |
parent | 07986230f1b5ff482a46242da6eefd1055521f7b (diff) | |
download | upstream-cf59e7255dff4020c397f375fd62f15df955f5d2.tar.gz upstream-cf59e7255dff4020c397f375fd62f15df955f5d2.tar.bz2 upstream-cf59e7255dff4020c397f375fd62f15df955f5d2.zip |
* rebase 3.0 patches * fold some fixes into existing patches
SVN-Revision: 28308
Diffstat (limited to 'target/linux/lantiq/patches-3.0/440-dwc_otg.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.0/440-dwc_otg.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-3.0/440-dwc_otg.patch b/target/linux/lantiq/patches-3.0/440-dwc_otg.patch index b833454705..73222ccacd 100644 --- a/target/linux/lantiq/patches-3.0/440-dwc_otg.patch +++ b/target/linux/lantiq/patches-3.0/440-dwc_otg.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig -@@ -116,6 +116,8 @@ +@@ -116,6 +116,8 @@ source "drivers/usb/wusbcore/Kconfig" source "drivers/usb/host/Kconfig" @@ -11,7 +11,7 @@ source "drivers/usb/renesas_usbhs/Kconfig" --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile -@@ -28,6 +28,8 @@ +@@ -28,6 +28,8 @@ obj-$(CONFIG_USB_C67X00_HCD) += c67x00/ obj-$(CONFIG_USB_WUSB) += wusbcore/ @@ -15615,7 +15615,7 @@ +#endif --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -2879,11 +2879,11 @@ +@@ -2885,11 +2885,11 @@ hub_port_init (struct usb_hub *hub, stru udev->ttport = hdev->ttport; } else if (udev->speed != USB_SPEED_HIGH && hdev->speed == USB_SPEED_HIGH) { |