X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm47xx%2Fpatches-2.6.25%2F690-mips-allow-pciregister-after-boot.patch;h=8b0445f5ba2778678ae801e2c5ac89725c39e5a3;hb=16a90e9d52979c6b83ce87075b0f989b442c9549;hp=0463da56152ea84fe310e407b0ead50dda429373;hpb=a11dfce7a25fb7de61f3306c25d833710fdb316b;p=openwrt-10.03%2F.git

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 0463da561..8b0445f5b 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,8 @@
 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
-===================================================================
---- 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
+--- a/arch/mips/pci/pci.c
++++ b/arch/mips/pci/pci.c
 @@ -21,6 +21,17 @@
   */
  int pci_probe_only;
@@ -146,10 +144,8 @@ Index: linux-2.6.25/arch/mips/pci/pci.c
  
  	return 0;
  }
-Index: linux-2.6.25/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
+--- a/drivers/ssb/main.c
++++ b/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