aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.38
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-06-18 15:52:15 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-06-18 15:52:15 +0000
commit79a7343560186716f25673c4bf43f752b4fb9032 (patch)
treef32c2e463010c0eb9f1e80d632625c3b252360f6 /target/linux/brcm47xx/patches-2.6.38
parent75f9e0c615d2fe50259ac6bc96e2b849fc975ea7 (diff)
downloadupstream-79a7343560186716f25673c4bf43f752b4fb9032.tar.gz
upstream-79a7343560186716f25673c4bf43f752b4fb9032.tar.bz2
upstream-79a7343560186716f25673c4bf43f752b4fb9032.zip
kernel: update to kernel 2.6.38.8
SVN-Revision: 27218
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.38')
-rw-r--r--target/linux/brcm47xx/patches-2.6.38/022-USB-Add-ehci-ssb-driver.patch6
-rw-r--r--target/linux/brcm47xx/patches-2.6.38/023-usb_ehci_ohci.patch4
-rw-r--r--target/linux/brcm47xx/patches-2.6.38/830-tg3_add_pci_ids.patch4
3 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.38/022-USB-Add-ehci-ssb-driver.patch b/target/linux/brcm47xx/patches-2.6.38/022-USB-Add-ehci-ssb-driver.patch
index 496b6c078f..6b042b170f 100644
--- a/target/linux/brcm47xx/patches-2.6.38/022-USB-Add-ehci-ssb-driver.patch
+++ b/target/linux/brcm47xx/patches-2.6.38/022-USB-Add-ehci-ssb-driver.patch
@@ -37,7 +37,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
depends on USB
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1254,9 +1254,14 @@ MODULE_LICENSE ("GPL");
+@@ -1256,9 +1256,14 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_msm_driver
#endif
@@ -53,7 +53,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#error "missing bus glue for ehci-hcd"
#endif
-@@ -1316,10 +1321,20 @@ static int __init ehci_hcd_init(void)
+@@ -1318,10 +1323,20 @@ static int __init ehci_hcd_init(void)
if (retval < 0)
goto clean4;
#endif
@@ -75,7 +75,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
clean4:
#endif
#ifdef OF_PLATFORM_DRIVER
-@@ -1350,6 +1365,9 @@ module_init(ehci_hcd_init);
+@@ -1352,6 +1367,9 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{
diff --git a/target/linux/brcm47xx/patches-2.6.38/023-usb_ehci_ohci.patch b/target/linux/brcm47xx/patches-2.6.38/023-usb_ehci_ohci.patch
index cf7425de66..6bcc4c3fbd 100644
--- a/target/linux/brcm47xx/patches-2.6.38/023-usb_ehci_ohci.patch
+++ b/target/linux/brcm47xx/patches-2.6.38/023-usb_ehci_ohci.patch
@@ -152,7 +152,7 @@
+#endif
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1322,17 +1322,21 @@ static int __init ehci_hcd_init(void)
+@@ -1324,17 +1324,21 @@ static int __init ehci_hcd_init(void)
goto clean4;
#endif
@@ -174,7 +174,7 @@
#ifdef XILINX_OF_PLATFORM_DRIVER
of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER);
clean4:
-@@ -1365,9 +1369,11 @@ module_init(ehci_hcd_init);
+@@ -1367,9 +1371,11 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{
diff --git a/target/linux/brcm47xx/patches-2.6.38/830-tg3_add_pci_ids.patch b/target/linux/brcm47xx/patches-2.6.38/830-tg3_add_pci_ids.patch
index d7c9b8cf8e..71ca06d332 100644
--- a/target/linux/brcm47xx/patches-2.6.38/830-tg3_add_pci_ids.patch
+++ b/target/linux/brcm47xx/patches-2.6.38/830-tg3_add_pci_ids.patch
@@ -23,7 +23,7 @@ Date: Thu Dec 16 20:01:17 2010 +0100
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752)},
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
-@@ -2073,6 +2073,7 @@
+@@ -2075,6 +2075,7 @@
#define PCI_DEVICE_ID_NX2_57711E 0x1650
#define PCI_DEVICE_ID_TIGON3_5705 0x1653
#define PCI_DEVICE_ID_TIGON3_5705_2 0x1654
@@ -31,7 +31,7 @@ Date: Thu Dec 16 20:01:17 2010 +0100
#define PCI_DEVICE_ID_TIGON3_5721 0x1659
#define PCI_DEVICE_ID_TIGON3_5722 0x165a
#define PCI_DEVICE_ID_TIGON3_5723 0x165b
-@@ -2086,11 +2087,13 @@
+@@ -2088,11 +2089,13 @@
#define PCI_DEVICE_ID_TIGON3_5754M 0x1672
#define PCI_DEVICE_ID_TIGON3_5755M 0x1673
#define PCI_DEVICE_ID_TIGON3_5756 0x1674