summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-06-18 15:53:14 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-06-18 15:53:14 +0000
commit47e218c426c5c787e0525e943e83867421aa7cce (patch)
tree8c9827ae648277d7a9bc01c1ec93ae5f2f0b115f /target/linux
parent79a7343560186716f25673c4bf43f752b4fb9032 (diff)
downloadmtk-20170518-47e218c426c5c787e0525e943e83867421aa7cce.zip
mtk-20170518-47e218c426c5c787e0525e943e83867421aa7cce.tar.gz
mtk-20170518-47e218c426c5c787e0525e943e83867421aa7cce.tar.bz2
brcm47xx: refresh patches
SVN-Revision: 27219
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm47xx/patches-2.6.39/022-USB-Add-ehci-ssb-driver.patch6
-rw-r--r--target/linux/brcm47xx/patches-2.6.39/023-usb_ehci_ohci.patch4
-rw-r--r--target/linux/brcm47xx/patches-2.6.39/830-tg3_add_pci_ids.patch4
3 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.39/022-USB-Add-ehci-ssb-driver.patch b/target/linux/brcm47xx/patches-2.6.39/022-USB-Add-ehci-ssb-driver.patch
index 252b5fe..13e2924 100644
--- a/target/linux/brcm47xx/patches-2.6.39/022-USB-Add-ehci-ssb-driver.patch
+++ b/target/linux/brcm47xx/patches-2.6.39/022-USB-Add-ehci-ssb-driver.patch
@@ -22,7 +22,7 @@
depends on USB
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1265,9 +1265,14 @@ MODULE_LICENSE ("GPL");
+@@ -1267,9 +1267,14 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER tegra_ehci_driver
#endif
@@ -38,7 +38,7 @@
#error "missing bus glue for ehci-hcd"
#endif
-@@ -1327,10 +1332,20 @@ static int __init ehci_hcd_init(void)
+@@ -1329,10 +1334,20 @@ static int __init ehci_hcd_init(void)
if (retval < 0)
goto clean4;
#endif
@@ -60,7 +60,7 @@
clean4:
#endif
#ifdef OF_PLATFORM_DRIVER
-@@ -1361,6 +1376,9 @@ module_init(ehci_hcd_init);
+@@ -1363,6 +1378,9 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{
diff --git a/target/linux/brcm47xx/patches-2.6.39/023-usb_ehci_ohci.patch b/target/linux/brcm47xx/patches-2.6.39/023-usb_ehci_ohci.patch
index c1fe00a..38f7450 100644
--- a/target/linux/brcm47xx/patches-2.6.39/023-usb_ehci_ohci.patch
+++ b/target/linux/brcm47xx/patches-2.6.39/023-usb_ehci_ohci.patch
@@ -152,7 +152,7 @@
+#endif
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1333,17 +1333,21 @@ static int __init ehci_hcd_init(void)
+@@ -1335,17 +1335,21 @@ static int __init ehci_hcd_init(void)
goto clean4;
#endif
@@ -174,7 +174,7 @@
#ifdef XILINX_OF_PLATFORM_DRIVER
platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
clean4:
-@@ -1376,9 +1380,11 @@ module_init(ehci_hcd_init);
+@@ -1378,9 +1382,11 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{
diff --git a/target/linux/brcm47xx/patches-2.6.39/830-tg3_add_pci_ids.patch b/target/linux/brcm47xx/patches-2.6.39/830-tg3_add_pci_ids.patch
index c1fcc6c..940fe73 100644
--- a/target/linux/brcm47xx/patches-2.6.39/830-tg3_add_pci_ids.patch
+++ b/target/linux/brcm47xx/patches-2.6.39/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
-@@ -2074,6 +2074,7 @@
+@@ -2076,6 +2076,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
-@@ -2089,11 +2090,13 @@
+@@ -2091,11 +2092,13 @@
#define PCI_DEVICE_ID_TIGON3_5754M 0x1672
#define PCI_DEVICE_ID_TIGON3_5755M 0x1673
#define PCI_DEVICE_ID_TIGON3_5756 0x1674