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 233cff53a623c9c3d65e2de85baf1e5cddb2d13d..86b82348b97c05c3709f02cda2826065deb72cf0 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -25,6 +25,7 @@ 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
 
@@ -46,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
@@ -97,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
@@ -439,6 +441,17 @@ config SERIAL_CONSOLE
 
          If unsure, say N.
 
+config SPARC_LEON
+       bool "Sparc Leon processor family"
+       depends on SPARC32
+       ---help---
+         If you say Y here if you are running on a SPARC-LEON processor.
+         The LEON processor is a synthesizable VHDL model of the
+         SPARC-v8 standard. LEON is  part of the GRLIB collection of
+         IP cores that are distributed under GPL. GRLIB can be downloaded
+         from www.gaisler.com. You can download a sparc-linux cross-compilation
+         toolchain at www.gaisler.com.
+
 endmenu
 
 menu "Bus options (PCI etc.)"