Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 371434dd744c4088a63c455be18aec92c46e5975..235d4514e0a9290ead0abe2e82ba711a700fb12c 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3,6 +3,7 @@ config MIPS
        default y
        # Horrible source of confusion.  Die, die, die ...
        select EMBEDDED
+       select RTC_LIB
 
 mainmenu "Linux/MIPS Kernel Configuration"
 
@@ -64,6 +65,7 @@ config MIPS_COBALT
        bool "Cobalt Server"
        select DMA_NONCOHERENT
        select HW_HAS_PCI
+       select I8253
        select I8259
        select IRQ_CPU
        select IRQ_GT641XX
@@ -111,6 +113,7 @@ config MACH_JAZZ
        select ARCH_MAY_HAVE_PC_FDC
        select GENERIC_ISA_DMA
        select IRQ_CPU
+       select I8253
        select I8259
        select ISA
        select PCSPEAKER
@@ -130,6 +133,7 @@ config LASAT
        select DMA_NONCOHERENT
        select SYS_HAS_EARLY_PRINTK
        select HW_HAS_PCI
+       select IRQ_CPU
        select PCI_GT64XXX_PCI0
        select MIPS_NILE4
        select R5000_CPU_SCACHE
@@ -200,6 +204,7 @@ config MIPS_MALTA
        select GENERIC_ISA_DMA
        select IRQ_CPU
        select HW_HAS_PCI
+       select I8253
        select I8259
        select MIPS_BOARDS_GEN
        select MIPS_BONITO64
@@ -333,7 +338,9 @@ config QEMU
        select DMA_COHERENT
        select GENERIC_ISA_DMA
        select HAVE_STD_PC_SERIAL_PORT
+       select I8253
        select I8259
+       select IRQ_CPU
        select ISA
        select PCSPEAKER
        select SWAP_IO_SPACE
@@ -360,6 +367,7 @@ config SGI_IP22
        select BOOT_ELF32
        select DMA_NONCOHERENT
        select HW_HAS_EISA
+       select I8253
        select IP22_CPU_SCACHE
        select IRQ_CPU
        select GENERIC_ISA_DMA_SUPPORT_BROKEN
@@ -403,6 +411,7 @@ config SGI_IP32
        select BOOT_ELF32
        select DMA_NONCOHERENT
        select HW_HAS_PCI
+       select IRQ_CPU
        select R5000_CPU_SCACHE
        select RM7000_CPU_SCACHE
        select SYS_HAS_CPU_R5000
@@ -532,6 +541,7 @@ config SNI_RM
        select HW_HAS_EISA
        select HW_HAS_PCI
        select IRQ_CPU
+       select I8253
        select I8259
        select ISA
        select PCSPEAKER
@@ -666,10 +676,18 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config GENERIC_CLOCKEVENTS
+       bool
+       default y
+
 config GENERIC_TIME
        bool
        default y
 
+config GENERIC_CMOS_UPDATE
+       bool
+       default y
+
 config SCHED_NO_NO_OMIT_FRAME_POINTER
        bool
        default y
@@ -896,6 +914,8 @@ config BOOT_ELF64
 
 menu "CPU selection"
 
+source "kernel/time/Kconfig"
+
 choice
        prompt "CPU type"
        default CPU_R4X00
@@ -1356,6 +1376,7 @@ config MIPS_MT_SMTC
        depends on CPU_MIPS32_R2
        #depends on CPU_MIPS64_R2               # once there is hardware ...
        depends on SYS_SUPPORTS_MULTITHREADING
+       select GENERIC_CLOCKEVENTS_BROADCAST
        select CPU_MIPSR2_IRQ_VI
        select CPU_MIPSR2_IRQ_EI
        select CPU_MIPSR2_SRS
@@ -1525,6 +1546,9 @@ config CPU_HAS_SYNC
        depends on !CPU_R3000
        default y
 
+config GENERIC_CLOCKEVENTS_BROADCAST
+       bool
+
 #
 # Use the generic interrupt handling code in kernel/irq/:
 #
@@ -1877,6 +1901,9 @@ config MMU
        bool
        default y
 
+config I8253
+       bool
+
 config PCSPEAKER
        bool