[ar71xx] move inclusion of the mach-ar71xx/Kconfig into the right patch
authorGabor Juhos <juhosg@openwrt.org>
Thu, 16 Oct 2008 13:33:33 +0000 (13:33 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Thu, 16 Oct 2008 13:33:33 +0000 (13:33 +0000)
SVN-Revision: 12988

target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch
target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch
target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch
target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch

index cd537eb..ebf8d60 100644 (file)
  config BASLER_EXCITE
        bool "Basler eXcite smart camera"
        select CEVT_R4K
+@@ -687,6 +705,7 @@
+ endchoice
++source "arch/mips/ar71xx/Kconfig"
+ source "arch/mips/au1000/Kconfig"
+ source "arch/mips/basler/excite/Kconfig"
+ source "arch/mips/jazz/Kconfig"
index 4ab8b75..e8af1ee 100644 (file)
@@ -10,7 +10,7 @@
  libs-$(CONFIG_SIBYTE_CFE)     += arch/mips/sibyte/cfe/
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -873,6 +873,9 @@
+@@ -874,6 +874,9 @@
  config MIPS_DISABLE_OBSOLETE_IDE
        bool
  
index a1e8280..755b920 100644 (file)
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -705,6 +705,7 @@
- endchoice
-+source "arch/mips/ar71xx/Kconfig"
- source "arch/mips/au1000/Kconfig"
- source "arch/mips/basler/excite/Kconfig"
- source "arch/mips/jazz/Kconfig"
-@@ -879,6 +880,9 @@
+@@ -880,6 +880,9 @@
  config SYNC_R4K
        bool
  
index f37b4d0..5db99d6 100644 (file)
  config BASLER_EXCITE
        bool "Basler eXcite smart camera"
        select CEVT_R4K
+@@ -598,6 +615,7 @@ config WR_PPMC
+ endchoice
++source "arch/mips/ar71xx/Kconfig"
+ source "arch/mips/au1000/Kconfig"
+ source "arch/mips/basler/excite/Kconfig"
+ source "arch/mips/jazz/Kconfig"
index 974ca0e..fdd4868 100644 (file)
@@ -10,7 +10,7 @@
  libs-$(CONFIG_SIBYTE_CFE)     += arch/mips/sibyte/cfe/
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -782,6 +782,9 @@ config MIPS_NILE4
+@@ -783,6 +783,9 @@ config MIPS_NILE4
  config MIPS_DISABLE_OBSOLETE_IDE
        bool
  
index bedc45f..dced430 100644 (file)
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -615,6 +615,7 @@ config WR_PPMC
- endchoice
-+source "arch/mips/ar71xx/Kconfig"
- source "arch/mips/au1000/Kconfig"
- source "arch/mips/basler/excite/Kconfig"
- source "arch/mips/jazz/Kconfig"
-@@ -788,6 +789,9 @@ config MYLOADER
+@@ -789,6 +789,9 @@ config MYLOADER
  config SYNC_R4K
        bool