Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-microblaze.git] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 267afdd..8a36ba8 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -87,6 +87,10 @@ config SYSVIPC_COMPAT
        depends on COMPAT && SYSVIPC
        default y
 
+config GENERIC_HARDIRQS
+       bool
+       default y
+
 menu "General machine setup"
 
 config SMP
@@ -162,6 +166,14 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config GENERIC_FIND_NEXT_BIT
+       bool
+       default y
+
+config GENERIC_HWEIGHT
+       bool
+       default y if !ULTRA_HAS_POPULATION_COUNT
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -179,13 +191,16 @@ config HUGETLB_PAGE_SIZE_512K
        bool "512K"
 
 config HUGETLB_PAGE_SIZE_64K
-       depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64K
+       depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64KB
        bool "64K"
 
 endchoice
 
 endmenu
 
+config ARCH_SELECT_MEMORY_MODEL
+       def_bool y
+
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
 
@@ -319,7 +334,7 @@ config COMPAT
        default y
 
 config BINFMT_ELF32
-       tristate "Kernel support for 32-bit ELF binaries"
+       bool "Kernel support for 32-bit ELF binaries"
        depends on SPARC32_COMPAT
        help
          This allows you to run 32-bit Linux/ELF binaries on your Ultra.