Merge git://git.infradead.org/~dwmw2/cafe-2.6

[linux-2.6] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index e90ef5db89138d258fdbce8cbc259cc55aeb7c1b..c1e69a1f92a4bf5adbc94e9f5417487502607cf4 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -22,13 +22,17 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
-config GENERIC_HARDIRQS
+config GENERIC_FIND_NEXT_BIT
+       bool
+       default y
+
+config GENERIC_HWEIGHT
        bool
        default y
 
-config RWSEM_GENERIC_SPINLOCK
-       bool
-       default y
+config GENERIC_HARDIRQS
+       bool
+       default y
 
 source "init/Kconfig"
 
@@ -202,7 +206,7 @@ source "drivers/pci/hotplug/Kconfig"
 
 endmenu
 
-menu "Exectuable file formats"
+menu "Executable file formats"
 
 # only elf supported
 config KCORE_ELF
@@ -237,7 +241,7 @@ menu "Xtensa initrd options"
        bool "Embed root filesystem ramdisk into the kernel"
 
 config EMBEDDED_RAMDISK_IMAGE
-       string "Filename of gziped ramdisk image"
+       string "Filename of gzipped ramdisk image"
        depends on EMBEDDED_RAMDISK
        default "ramdisk.gz"
        help