Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 7c58fc1a39c46ae6f7bab2aeb57ffafcf495b12d..d0dec1ea2eed93345091981a64c6028f9ae474ff 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -150,6 +150,14 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
+config GENERIC_FIND_NEXT_BIT
+       bool
+       default y
+
+config GENERIC_HWEIGHT
+       bool
+       default y
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -158,6 +166,14 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default y
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
 config SUN_PM
        bool
        default y
@@ -204,8 +220,8 @@ config SPARC_LED
        tristate "Sun4m LED driver"
        help
          This driver toggles the front-panel LED on sun4m systems
-         in a user-specifyable manner.  It's state can be probed
-         by reading /proc/led and it's blinking mode can be changed
+         in a user-specifiable manner.  Its state can be probed
+         by reading /proc/led and its blinking mode can be changed
          via writes to /proc/led
 
 source "fs/Kconfig.binfmt"
@@ -281,6 +297,13 @@ endmenu
 
 source "fs/Kconfig"
 
+menu "Instrumentation Support"
+       depends on EXPERIMENTAL
+
+source "arch/sparc/oprofile/Kconfig"
+
+endmenu
+
 source "arch/sparc/Kconfig.debug"
 
 source "security/Kconfig"