MIPS: Alchemy: Merge PB1200 support into DB1200 code.

[sfrench/cifs-2.6.git] / arch / mips / alchemy / Kconfig

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index a1b995ff517b10c5d6b9347bf47fd524bfbe2649..e1b3be787f80c74db12fba4797abc03ff66825bf 100644 (file)
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -42,7 +42,7 @@ config MIPS_DB1100
        select SYS_HAS_EARLY_PRINTK
 
 config MIPS_DB1200
-       bool "Alchemy DB1200 board"
+       bool "Alchemy DB1200/PB1200 board"
        select ALCHEMY_GPIOINT_AU1000
        select DMA_COHERENT
        select MIPS_DISABLE_OBSOLETE_IDE
@@ -85,14 +85,6 @@ config MIPS_PB1100
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_HAS_EARLY_PRINTK
 
-config MIPS_PB1200
-       bool "Alchemy PB1200 board"
-       select ALCHEMY_GPIOINT_AU1000
-       select DMA_NONCOHERENT
-       select MIPS_DISABLE_OBSOLETE_IDE
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select SYS_HAS_EARLY_PRINTK
-
 config MIPS_PB1500
        bool "Alchemy PB1500 board"
        select ALCHEMY_GPIOINT_AU1000