refresh generic 2.6.23 patches in upstream style
SVN-Revision: 11366
This commit is contained in:
@@ -1,20 +1,16 @@
|
||||
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
|
||||
@@ -223,3 +223,5 @@ void ssb_mipscore_init(struct ssb_mipsco
|
||||
--- a/drivers/ssb/driver_mipscore.c
|
||||
+++ b/drivers/ssb/driver_mipscore.c
|
||||
@@ -223,3 +223,5 @@
|
||||
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
|
||||
@@ -352,4 +352,19 @@ struct parisc_device_id {
|
||||
--- a/include/linux/mod_devicetable.h
|
||||
+++ b/include/linux/mod_devicetable.h
|
||||
@@ -352,4 +352,19 @@
|
||||
#define PA_HVERSION_ANY_ID 0xffff
|
||||
#define PA_SVERSION_ANY_ID 0xffffffff
|
||||
|
||||
@@ -34,11 +30,9 @@ Index: linux-2.6.23.17/include/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
|
||||
@@ -321,14 +321,16 @@ static int ssb_bus_match(struct device *
|
||||
--- a/drivers/ssb/main.c
|
||||
+++ b/drivers/ssb/main.c
|
||||
@@ -321,14 +321,16 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -57,11 +51,9 @@ 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);
|
||||
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
|
||||
@@ -391,12 +391,14 @@ int ssb_bus_scan(struct ssb_bus *bus,
|
||||
--- a/drivers/ssb/scan.c
|
||||
+++ b/drivers/ssb/scan.c
|
||||
@@ -391,12 +391,14 @@
|
||||
if (bus->bustype == SSB_BUSTYPE_PCI) {
|
||||
/* Ignore PCI cores on PCI-E cards.
|
||||
* Ignore PCI-E cores on PCI cards. */
|
||||
@@ -80,11 +72,9 @@ Index: linux-2.6.23.17/drivers/ssb/scan.c
|
||||
}
|
||||
}
|
||||
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
|
||||
@@ -362,7 +362,7 @@ static int pcicore_is_in_hostmode(struct
|
||||
--- a/drivers/ssb/driver_pcicore.c
|
||||
+++ b/drivers/ssb/driver_pcicore.c
|
||||
@@ -362,7 +362,7 @@
|
||||
chipid_top != 0x5300)
|
||||
return 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user