Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 77e3d2402454c13776c7cc1982d7b51ce8968997..e5a7c5d96364f73f5cf700a9ac70d9ee67d3bda8 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -81,7 +81,9 @@ config MIPS_COBALT
 config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32
+       select CEVT_DS1287
        select CEVT_R4K
+       select CSRC_IOASIC
        select CSRC_R4K
        select CPU_DADDI_WORKAROUNDS if 64BIT
        select CPU_R4000_WORKAROUNDS if 64BIT
@@ -769,6 +771,9 @@ config BOOT_RAW
 config CEVT_BCM1480
        bool
 
+config CEVT_DS1287
+       bool
+
 config CEVT_GT641XX
        bool
 
@@ -784,6 +789,9 @@ config CEVT_TXX9
 config CSRC_BCM1480
        bool
 
+config CSRC_IOASIC
+       bool
+
 config CSRC_R4K
        bool