aboutsummaryrefslogtreecommitdiffstats
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
commit18c2ac7fd73cb71300d6de0abc044a88296f196e (patch)
treebba15878199743d9aa9123f57b47a2e4a7e2f672 /target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
parent7fcae2b69aebe6554c5a85167bea441116fc9daa (diff)
downloadmaster-187ad058-18c2ac7fd73cb71300d6de0abc044a88296f196e.tar.gz
master-187ad058-18c2ac7fd73cb71300d6de0abc044a88296f196e.tar.bz2
master-187ad058-18c2ac7fd73cb71300d6de0abc044a88296f196e.zip
[brcm47xx] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11200 3c298f89-4303-0410-b956-a3cf2f4a3e73
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