[adm5120] add button devices to several boards

[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 132b41d..cc5de49 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,10 @@
 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.23.16/arch/mips/pci/pci.c
+Index: linux-2.6.25.4/arch/mips/pci/pci.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.16.orig/arch/mips/pci/pci.c   2008-02-20 16:06:36.000000000 +0100
-+++ linux-2.6.23.16/arch/mips/pci/pci.c        2008-02-20 16:09:33.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;
 @@ -21,6 +21,17 @@
   */
  int pci_probe_only;


@@ -146,11 +146,11 @@ Index: linux-2.6.23.16/arch/mips/pci/pci.c
  
        return 0;
  }
  
        return 0;
  }

-Index: linux-2.6.23.16/drivers/ssb/main.c
+Index: linux-2.6.25.4/drivers/ssb/main.c

 ===================================================================
 ===================================================================

---- linux-2.6.23.16.orig/drivers/ssb/main.c    2008-02-20 16:06:36.000000000 +0100
-+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-20 18:33:21.000000000 +0100
-@@ -1185,9 +1185,7 @@ static int __init ssb_modinit(void)
+--- 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
   * and device_initcall. */
  /* ssb must be initialized after PCI but before the ssb drivers.
   * That means we must use some initcall between subsys_initcall
   * and device_initcall. */