summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-19 08:08:23 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-19 08:08:23 +0000
commit4da0e6f2359f760af5fc6096a795edeaae95a882 (patch)
tree01684b956d4ac7ea771ba926340e91d9d00e9c03 /target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
parent2dea6c7d0a54349796e5f0b5d2ad29c8315caa88 (diff)
downloadmaster-31e0f0ae-4da0e6f2359f760af5fc6096a795edeaae95a882.tar.gz
master-31e0f0ae-4da0e6f2359f760af5fc6096a795edeaae95a882.tar.bz2
master-31e0f0ae-4da0e6f2359f760af5fc6096a795edeaae95a882.zip
refresh kernel patches
SVN-Revision: 11200
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch b/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
index 0463da5615..cc5de49fa5 100644
--- a/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
@@ -1,10 +1,10 @@
Allow registering PCI devices after early boot.
This is an ugly hack and needs to be rewritten before going upstream.
-Index: linux-2.6.25/arch/mips/pci/pci.c
+Index: linux-2.6.25.4/arch/mips/pci/pci.c
===================================================================
---- linux-2.6.25.orig/arch/mips/pci/pci.c 2008-04-27 21:49:19.000000000 +0100
-+++ linux-2.6.25/arch/mips/pci/pci.c 2008-04-27 21:58:31.000000000 +0100
+--- linux-2.6.25.4.orig/arch/mips/pci/pci.c
++++ linux-2.6.25.4/arch/mips/pci/pci.c
@@ -21,6 +21,17 @@
*/
int pci_probe_only;
@@ -146,10 +146,10 @@ Index: linux-2.6.25/arch/mips/pci/pci.c
return 0;
}
-Index: linux-2.6.25/drivers/ssb/main.c
+Index: linux-2.6.25.4/drivers/ssb/main.c
===================================================================
---- linux-2.6.25.orig/drivers/ssb/main.c 2008-04-27 21:55:32.000000000 +0100
-+++ linux-2.6.25/drivers/ssb/main.c 2008-04-27 21:58:31.000000000 +0100
+--- linux-2.6.25.4.orig/drivers/ssb/main.c
++++ linux-2.6.25.4/drivers/ssb/main.c
@@ -1191,9 +1191,7 @@ static int __init ssb_modinit(void)
/* ssb must be initialized after PCI but before the ssb drivers.
* That means we must use some initcall between subsys_initcall