Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[karo-tx-linux.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index b847f880eeca4c1126d0eb9bfb3799f22eb13b99..86b82348b97c05c3709f02cda2826065deb72cf0 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -25,6 +25,9 @@ config SPARC
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select RTC_CLASS
        select RTC_DRV_M48T59
+       select HAVE_PERF_COUNTERS
+       select HAVE_DMA_ATTRS
+       select HAVE_DMA_API_DEBUG
 
 config SPARC32
        def_bool !64BIT
@@ -44,6 +47,7 @@ config SPARC64
        select RTC_DRV_BQ4802
        select RTC_DRV_SUN4V
        select RTC_DRV_STARFIRE
+       select HAVE_PERF_COUNTERS
 
 config ARCH_DEFCONFIG
        string
@@ -95,7 +99,7 @@ config AUDIT_ARCH
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y if SPARC64
 
-config HAVE_DYNAMIC_PER_CPU_AREA
+config NEED_PER_CPU_EMBED_FIRST_CHUNK
        def_bool y if SPARC64
 
 config GENERIC_HARDIRQS_NO__DO_IRQ