Pull bugzilla-5653 into release branch

[powerpc.git] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 2b6257b..dbeb350 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -18,15 +18,15 @@ config XTENSA
          with reasonable minimum requirements.  The Xtensa Linux project has
          a home page at <http://xtensa.sourceforge.net/>.
 
-config UID16
+config RWSEM_XCHGADD_ALGORITHM
        bool
-       default n
+       default y
 
-config RWSEM_XCHGADD_ALGORITHM
+config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
-config HAVE_DEC_LOCK
+config GENERIC_HWEIGHT
        bool
        default y
 
@@ -34,6 +34,10 @@ config GENERIC_HARDIRQS
        bool
        default y
 
+config RWSEM_GENERIC_SPINLOCK
+       bool
+       default y
+
 source "init/Kconfig"
 
 menu "Processor type and features"