brcm47xx: refresh patches
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 18 Jun 2011 15:53:14 +0000 (15:53 +0000)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 18 Jun 2011 15:53:14 +0000 (15:53 +0000)
SVN-Revision: 27219

target/linux/brcm47xx/patches-2.6.39/022-USB-Add-ehci-ssb-driver.patch
target/linux/brcm47xx/patches-2.6.39/023-usb_ehci_ohci.patch
target/linux/brcm47xx/patches-2.6.39/830-tg3_add_pci_ids.patch

index 252b5fea7961331784bd34915d25270f39dc6b0c..13e29245c62edea78c42a662719f27d6fa1370aa 100644 (file)
@@ -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)
  {
index c1fe00aab0e922cf5fddc628bcf851fcde8ceb4c..38f7450436dd3984e0e8a676bab257b9015b3a93 100644 (file)
 +#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
  
  #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)
  {
index c1fcc6cddf723af34f61a9012fbeec4e692ebdf3..940fe73eb0deaed2b6619706a9b29675f98d16db 100644 (file)
@@ -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