2 files changed, 3 insertions, 20 deletions

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index df3b1a7eb15d..1179c4d4cf15 100644
--- 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
diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform
index 495cc9a2a3b1..0bf2b09f3105 100644
--- a/arch/mips/alchemy/Platform
+++ b/arch/mips/alchemy/Platform
@@ -1,7 +1,7 @@
 #
 # Core Alchemy code
 #
-platform-$(CONFIG_MACH_ALCHEMY) += alchemy/common/
+platform-$(CONFIG_MIPS_ALCHEMY) += alchemy/common/
 
 
 #
@@ -106,4 +106,4 @@ load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000
 # compiler picks the board one.  If they don't, it will make sure
 # the alchemy generic gpio header is picked up.
 
-cflags-$(CONFIG_MACH_ALCHEMY)   += -I$(srctree)/arch/mips/include/asm/mach-au1x00
+cflags-$(CONFIG_MIPS_ALCHEMY)   += -I$(srctree)/arch/mips/include/asm/mach-au1x00