Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux...

[net-next-2.6.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 1cd0d9d3c761dad0bc443269139cbfe2bcc84cf6..491e9d6de1912d56cea2b21f51bf8cfd7980e278 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -18,6 +18,7 @@ config 64BIT
 config SPARC
        bool
        default y
+       select OF
        select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_ARCH_KGDB if !SMP || SPARC64
@@ -145,9 +146,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