Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / arch / mips / vr41xx / Kconfig

diff --git a/arch/mips/vr41xx/Kconfig b/arch/mips/vr41xx/Kconfig
index 8f4d3e7..c1be6b3 100644 (file)
--- a/arch/mips/vr41xx/Kconfig
+++ b/arch/mips/vr41xx/Kconfig
@@ -5,6 +5,8 @@ choice
 
 config CASIO_E55
        bool "CASIO CASSIOPEIA E-10/15/55/65"
+       select CEVT_R4K
+       select CSRC_R4K
        select DMA_NONCOHERENT
        select IRQ_CPU
        select ISA
@@ -13,22 +15,18 @@ config CASIO_E55
 
 config IBM_WORKPAD
        bool "IBM WorkPad z50"
+       select CEVT_R4K
+       select CSRC_R4K
        select DMA_NONCOHERENT
        select IRQ_CPU
        select ISA
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config NEC_CMBVR4133
-       bool "NEC CMB-VR4133"
-       select DMA_NONCOHERENT
-       select IRQ_CPU
-       select HW_HAS_PCI
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-
 config TANBAC_TB022X
        bool "TANBAC VR4131 multichip module and TANBAC VR4131DIMM"
+       select CEVT_R4K
+       select CSRC_R4K
        select DMA_NONCOHERENT
        select IRQ_CPU
        select HW_HAS_PCI
@@ -43,6 +41,8 @@ config TANBAC_TB022X
 
 config VICTOR_MPC30X
        bool "Victor MP-C303/304"
+       select CEVT_R4K
+       select CSRC_R4K
        select DMA_NONCOHERENT
        select IRQ_CPU
        select HW_HAS_PCI
@@ -52,6 +52,8 @@ config VICTOR_MPC30X
 
 config ZAO_CAPCELLA
        bool "ZAO Networks Capcella"
+       select CEVT_R4K
+       select CSRC_R4K
        select DMA_NONCOHERENT
        select IRQ_CPU
        select HW_HAS_PCI
@@ -61,13 +63,6 @@ config ZAO_CAPCELLA
 
 endchoice
 
-config ROCKHOPPER
-       bool "Support for Rockhopper base board"
-       depends on NEC_CMBVR4133
-       select PCI_VR41XX
-       select I8259
-       select HAVE_STD_PC_SERIAL_PORT
-
 choice
        prompt "Base board type"
        depends on TANBAC_TB022X