Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.

1 files changed, 1 insertions, 6 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 19aa7b253d78..093a6d35e064 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -12,6 +12,7 @@ config 64BIT
 config SPARC
         bool
         default y
+        select OF
         select HAVE_IDE
         select HAVE_OPROFILE
         select HAVE_ARCH_KGDB if !SMP || SPARC64
@@ -60,9 +61,6 @@ config BITS
         default 32 if SPARC32
         default 64 if SPARC64
 
-config GENERIC_TIME
-        def_bool y
-
 config ARCH_USES_GETTIMEOFFSET
         bool
         default y if SPARC32
@@ -142,9 +140,6 @@ config GENERIC_GPIO
 config ARCH_NO_VIRT_TO_BUS
         def_bool y
 
-config OF
-        def_bool y
-
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
         def_bool y if SPARC64