Merge branch 'master' into upstream-fixes

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

diff --git a/arch/mips/vr41xx/Kconfig b/arch/mips/vr41xx/Kconfig
index 8f4d3e74c2307017dfa1e44dcd90a4b595aafe4a..559acc09c819f3c53efbc8327514368f41b5af2e 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,6 +15,8 @@ config CASIO_E55
 
 config IBM_WORKPAD
        bool "IBM WorkPad z50"
+       select CEVT_R4K
+       select CSRC_R4K
        select DMA_NONCOHERENT
        select IRQ_CPU
        select ISA
@@ -21,6 +25,8 @@ config IBM_WORKPAD
 
 config NEC_CMBVR4133
        bool "NEC CMB-VR4133"
+       select CEVT_R4K
+       select CSRC_R4K
        select DMA_NONCOHERENT
        select IRQ_CPU
        select HW_HAS_PCI
@@ -29,6 +35,8 @@ config NEC_CMBVR4133
 
 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 +51,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 +62,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