Add bcm63xx_wdt but do not enable it yet

[openwrt.git] / target / linux / brcm47xx / patches-2.6.25 / 690-mips-allow-pciregister-after-boot.patch

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 0463da5..8b0445f 100644 (file)
--- 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.
 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;
 @@ -21,6 +21,17 @@
   */
  int pci_probe_only;


@@ -146,10 +144,8 @@ Index: linux-2.6.25/arch/mips/pci/pci.c
  
        return 0;
  }
  
        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
 @@ -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