From e33660fd06bced5b743941ccf2678e7b7b94b4df Mon Sep 17 00:00:00 2001 From: Gabor Juhos <juhosg@openwrt.org> Date: Thu, 16 Oct 2008 13:33:33 +0000 Subject: [PATCH] move inclusion of the mach-ar71xx/Kconfig into the right patch SVN-Revision: 12988 --- .../linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch | 8 ++++++++ .../ar71xx/patches-2.6.26/300-mips_fw_myloader.patch | 2 +- .../900-mips_multi_machine_support.patch | 10 +--------- .../linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch | 8 ++++++++ .../ar71xx/patches-2.6.27/300-mips_fw_myloader.patch | 2 +- .../900-mips_multi_machine_support.patch | 10 +--------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch index cd537eb0ca..ebf8d60394 100644 --- a/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch @@ -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" diff --git a/target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch index 4ab8b75213..e8af1eeb87 100644 --- a/target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch @@ -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 diff --git a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch index a1e82808c7..755b920e41 100644 --- a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch +++ b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch @@ -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 diff --git a/target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch index f37b4d0b16..5db99d6a82 100644 --- a/target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch @@ -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" diff --git a/target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch index 974ca0ed72..fdd48686c6 100644 --- a/target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch @@ -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 diff --git a/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch b/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch index bedc45f530..dced430213 100644 --- a/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch +++ b/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch @@ -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 -- GitLab