aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-06-17 12:57:04 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-06-17 12:57:04 +0000
commit4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb (patch)
tree40cb3a459399cd0fc128e0f0cfcb82cab6409ed0 /target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch
parent3415b8c04439a74b9311b2d5a4beb14a13341525 (diff)
downloadupstream-4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb.tar.gz
upstream-4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb.tar.bz2
upstream-4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb.zip
upgrade to 2.6.25.7, and refresh patches
SVN-Revision: 11523
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch
index c33af0071d..f599ca773c 100644
--- a/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/usb/host/ohci-ssb.c
-+++ linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
-@@ -142,10 +142,59 @@ static int ssb_ohci_attach(struct ssb_de
+--- a/drivers/usb/host/ohci-ssb.c
++++ b/drivers/usb/host/ohci-ssb.c
+@@ -142,10 +142,59 @@
int err = -ENOMEM;
u32 tmp, flags = 0;
@@ -64,7 +62,7 @@ Index: linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
dev->dev->bus_id);
-@@ -236,6 +285,7 @@ static int ssb_ohci_resume(struct ssb_de
+@@ -236,6 +285,7 @@
static const struct ssb_device_id ssb_ohci_table[] = {
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),