[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 930-ssb_fixes.patch

diff --git a/target/linux/generic-2.6/patches-2.6.23/930-ssb_fixes.patch b/target/linux/generic-2.6/patches-2.6.23/930-ssb_fixes.patch
index 6658d2b..d3c7cfd 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/930-ssb_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/930-ssb_fixes.patch
@@ -1,19 +1,15 @@
 This patch ports ssb to the 2.6.23 kernel.
 
 This patch ports ssb to the 2.6.23 kernel.
 

-Index: linux-2.6.23.17/drivers/ssb/driver_mipscore.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/ssb/driver_mipscore.c
-+++ linux-2.6.23.17/drivers/ssb/driver_mipscore.c
+--- a/drivers/ssb/driver_mipscore.c
++++ b/drivers/ssb/driver_mipscore.c

 @@ -223,3 +223,5 @@ void ssb_mipscore_init(struct ssb_mipsco
        ssb_mips_serial_init(mcore);
        ssb_mips_flash_detect(mcore);
  }
 +
 +EXPORT_SYMBOL(ssb_mips_irq);
 @@ -223,3 +223,5 @@ void ssb_mipscore_init(struct ssb_mipsco
        ssb_mips_serial_init(mcore);
        ssb_mips_flash_detect(mcore);
  }
 +
 +EXPORT_SYMBOL(ssb_mips_irq);

-Index: linux-2.6.23.17/include/linux/mod_devicetable.h
-===================================================================
---- linux-2.6.23.17.orig/include/linux/mod_devicetable.h
-+++ linux-2.6.23.17/include/linux/mod_devicetable.h
+--- a/include/linux/mod_devicetable.h
++++ b/include/linux/mod_devicetable.h

 @@ -352,4 +352,19 @@ struct parisc_device_id {
  #define PA_HVERSION_ANY_ID    0xffff
  #define PA_SVERSION_ANY_ID    0xffffffff
 @@ -352,4 +352,19 @@ struct parisc_device_id {
  #define PA_HVERSION_ANY_ID    0xffff
  #define PA_SVERSION_ANY_ID    0xffffffff


@@ -34,10 +30,8 @@ Index: linux-2.6.23.17/include/linux/mod_devicetable.h
 +#define SSB_ANY_REV           0xFF
 +
  #endif /* LINUX_MOD_DEVICETABLE_H */
 +#define SSB_ANY_REV           0xFF
 +
  #endif /* LINUX_MOD_DEVICETABLE_H */

-Index: linux-2.6.23.17/drivers/ssb/main.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/ssb/main.c
-+++ linux-2.6.23.17/drivers/ssb/main.c
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c

 @@ -321,14 +321,16 @@ static int ssb_bus_match(struct device *
        return 0;
  }
 @@ -321,14 +321,16 @@ static int ssb_bus_match(struct device *
        return 0;
  }


@@ -57,10 +51,8 @@ Index: linux-2.6.23.17/drivers/ssb/main.c
                             "MODALIAS=ssb:v%04Xid%04Xrev%02X",
                             ssb_dev->id.vendor, ssb_dev->id.coreid,
                             ssb_dev->id.revision);
                             "MODALIAS=ssb:v%04Xid%04Xrev%02X",
                             ssb_dev->id.vendor, ssb_dev->id.coreid,
                             ssb_dev->id.revision);

-Index: linux-2.6.23.17/drivers/ssb/scan.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/ssb/scan.c
-+++ linux-2.6.23.17/drivers/ssb/scan.c
+--- a/drivers/ssb/scan.c
++++ b/drivers/ssb/scan.c

 @@ -391,12 +391,14 @@ int ssb_bus_scan(struct ssb_bus *bus,
                        if (bus->bustype == SSB_BUSTYPE_PCI) {
                                /* Ignore PCI cores on PCI-E cards.
 @@ -391,12 +391,14 @@ int ssb_bus_scan(struct ssb_bus *bus,
                        if (bus->bustype == SSB_BUSTYPE_PCI) {
                                /* Ignore PCI cores on PCI-E cards.


@@ -80,10 +72,8 @@ Index: linux-2.6.23.17/drivers/ssb/scan.c
                                }
                        }
                        if (bus->pcicore.dev) {
                                }
                        }
                        if (bus->pcicore.dev) {

-Index: linux-2.6.23.17/drivers/ssb/driver_pcicore.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/ssb/driver_pcicore.c
-+++ linux-2.6.23.17/drivers/ssb/driver_pcicore.c
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c

 @@ -362,7 +362,7 @@ static int pcicore_is_in_hostmode(struct
            chipid_top != 0x5300)
                return 0;
 @@ -362,7 +362,7 @@ static int pcicore_is_in_hostmode(struct
            chipid_top != 0x5300)
                return 0;