Pull battery into release branch

[sfrench/cifs-2.6.git] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index df6ee71894d1f3228a6ddf59a599df3eeced3e9d..33dabf588bdd5a41276ac2675ffd583a4a9a71ae 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -23,6 +23,10 @@ config GENERIC_TIME
        bool
        default y
 
+config GENERIC_CMOS_UPDATE
+       bool
+       default y
+
 config GENERIC_CLOCKEVENTS
        bool
        default y
@@ -65,6 +69,9 @@ config AUDIT_ARCH
 config ARCH_NO_VIRT_TO_BUS
        def_bool y
 
+config OF
+       def_bool y
+
 choice
        prompt "Kernel page size"
        default SPARC64_PAGE_SIZE_8KB