Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / arch / x86_64 / Kconfig

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 14bf8ce..45f82ae 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -32,6 +32,10 @@ config GENERIC_TIME_VSYSCALL
        bool
        default y
 
+config GENERIC_CMOS_UPDATE
+       bool
+       default y
+
 config ZONE_DMA32
        bool
        default y
@@ -56,6 +60,14 @@ config ZONE_DMA
        bool
        default y
 
+config QUICKLIST
+       bool
+       default y
+
+config NR_QUICK
+       int
+       default 2
+
 config ISA
        bool