MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMY

[linux-2.6-block.git] / arch / mips / alchemy / Kconfig

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index df3b1a7eb15d98b7d5643ee940aef5a90d04bd9a..1179c4d4cf15d5cfd272df6474c6ba4dad8a5918 100644 (file)
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -11,7 +11,7 @@ config ALCHEMY_GPIO_INDIRECT
 
 choice
        prompt "Machine type"
-       depends on MACH_ALCHEMY
+       depends on MIPS_ALCHEMY
        default MIPS_DB1000
 
 config MIPS_MTX1
@@ -132,37 +132,20 @@ endchoice
 
 config SOC_AU1000
        bool
-       select SOC_AU1X00
        select ALCHEMY_GPIOINT_AU1000
 
 config SOC_AU1100
        bool
-       select SOC_AU1X00
        select ALCHEMY_GPIOINT_AU1000
 
 config SOC_AU1500
        bool
-       select SOC_AU1X00
        select ALCHEMY_GPIOINT_AU1000
 
 config SOC_AU1550
        bool
-       select SOC_AU1X00
        select ALCHEMY_GPIOINT_AU1000
 
 config SOC_AU1200
        bool
-       select SOC_AU1X00
        select ALCHEMY_GPIOINT_AU1000
-
-config SOC_AU1X00
-       bool
-       select 64BIT_PHYS_ADDR
-       select CEVT_R4K_LIB
-       select CSRC_R4K_LIB
-       select IRQ_CPU
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_APM_EMULATION
-       select GENERIC_GPIO
-       select ARCH_WANT_OPTIONAL_GPIOLIB