ar71xx: merge DIR-600 A1 and DIR-615 E4 support

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files-2.6.39 / arch / mips / ar71xx / Kconfig

diff --git a/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/Kconfig b/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/Kconfig
index 14982b1953da80333b92ca95ffe71342ec7ce00c..02d88c876f4d94cd1496a62bb68fdd7411651d08 100644 (file)
--- a/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/Kconfig
+++ b/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/Kconfig
@@ -87,7 +87,7 @@ config AR71XX_MACH_DB120
        select AR71XX_DEV_USB
 
 config AR71XX_MACH_DIR_600_A1
-       bool "D-Link DIR-600 rev. A1 support"
+       bool "D-Link DIR-600 A1/DIR-615 E4 support"
        select SOC_AR724X
        select AR71XX_DEV_AP91_PCI if PCI
        select AR71XX_DEV_M25P80
@@ -104,15 +104,6 @@ config AR71XX_MACH_DIR_615_C1
        select AR71XX_DEV_LEDS_GPIO
        select AR71XX_NVRAM
 
-config AR71XX_MACH_DIR_615_E4
-       bool "D-Link DIR-615 rev. E4 support"
-       select SOC_AR724X
-       select AR71XX_DEV_AP91_PCI if PCI
-       select AR71XX_DEV_M25P80
-       select AR71XX_DEV_GPIO_BUTTONS
-       select AR71XX_DEV_LEDS_GPIO
-       select AR71XX_NVRAM
-
 config AR71XX_MACH_DIR_825_B1
        bool "D-Link DIR-825 rev. B1 board support"
        select SOC_AR71XX