diff --git a/[refs] b/[refs] index c4743dcce821..eeb04462a8d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10f85f43ef134014da72d2bcc1bff1abb9b0640c +refs/heads/master: 7b14c647aee98db2d10705da385f9c19cc83a9af diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig index 6f1470baa314..d02e8ac7aa10 100644 --- a/trunk/arch/sparc/Kconfig +++ b/trunk/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 @@ -149,7 +150,7 @@ config ARCH_NO_VIRT_TO_BUS def_bool y config OF - def_bool y + bool config ARCH_SUPPORTS_DEBUG_PAGEALLOC def_bool y if SPARC64