From c6b58b88d02e754f943b109fa9c2e40093398d6a Mon Sep 17 00:00:00 2001 From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> Date: Thu, 16 Oct 2008 13:33:33 +0000 Subject: [ar71xx] move inclusion of the mach-ar71xx/Kconfig into the right patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12988 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch | 8 ++++++++ target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch | 2 +- .../ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch | 10 +--------- target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch | 8 ++++++++ target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch | 2 +- .../ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch | 10 +--------- 6 files changed, 20 insertions(+), 20 deletions(-) (limited to 'target/linux/ar71xx') 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 cd537eb0c..ebf8d6039 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 4ab8b7521..e8af1eeb8 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 a1e82808c..755b920e4 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 f37b4d0b1..5db99d6a8 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 974ca0ed7..fdd48686c 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 bedc45f53..dced43021 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 -- cgit v1.2.3