move inclusion of the mach-ar71xx/Kconfig into the right patch

SVN-Revision: 12988
v19.07.3_mercusys_ac12_duma
Gabor Juhos 16 years ago
parent 19b0e56ba7
commit e33660fd06

@ -60,3 +60,11 @@
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"

@ -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

@ -123,15 +123,7 @@
--- 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

@ -59,3 +59,11 @@
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"

@ -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

@ -123,15 +123,7 @@
--- 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

Loading…
Cancel
Save