summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/pb1200_defconfig
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2010-07-15 21:45:04 +0200
committerRalf Baechle <ralf@linux-mips.org>2010-08-05 13:26:06 +0100
commit42a4f17dc356689075263d7c2bd68456676fa62e (patch)
tree2c66f5be57722cff7bb39eb0b59c3ec6eb24fff6 /arch/mips/configs/pb1200_defconfig
parent745aef5df1e2277ee9e34d86491084c0d6106338 (diff)
MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMY
Remove the CONFIG_SOC_AU1X00 Kconfig symbol since its job can also be done by MACH_ALCHEMY, now renamed to MIPS_ALCHEMY. Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com> To: Linux-MIPS <linux-mips@linux-mips.org> Patchwork: https://patchwork.linux-mips.org/patch/1461/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/configs/pb1200_defconfig')
-rw-r--r--arch/mips/configs/pb1200_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/configs/pb1200_defconfig b/arch/mips/configs/pb1200_defconfig
index e9ad77320f1..0f908c69211 100644
--- a/arch/mips/configs/pb1200_defconfig
+++ b/arch/mips/configs/pb1200_defconfig
@@ -8,7 +8,7 @@ CONFIG_MIPS=y
#
# Machine selection
#
-CONFIG_MACH_ALCHEMY=y
+CONFIG_MIPS_ALCHEMY=y
# CONFIG_AR7 is not set
# CONFIG_BCM47XX is not set
# CONFIG_BCM63XX is not set
@@ -64,7 +64,6 @@ CONFIG_MIPS_PB1200=y
# CONFIG_MIPS_PB1550 is not set
# CONFIG_MIPS_XXS1500 is not set
CONFIG_SOC_AU1200=y
-CONFIG_SOC_AU1X00=y
CONFIG_LOONGSON_UART_BASE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set