Merge branches 'gemini' and 'misc' into devel

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

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 75291fd..3e2e540 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -51,9 +51,8 @@ config GENERIC_TIME
        bool
        default y
 
-config ARCH_USES_GETTIMEOFFSET
-       bool
-       default y
+config GENERIC_CMOS_UPDATE
+        def_bool y
 
 config ZONE_DMA
        bool
@@ -62,6 +61,9 @@ config ZONE_DMA
 config NEED_DMA_MAP_STATE
        def_bool y
 
+config NEED_SG_DMA_LENGTH
+       def_bool y
+
 config GENERIC_ISA_DMA
        bool
        default y