Merge branches 'fixes' and 'fixes2' into devel-late

[pandora-kernel.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 6c0683d..83bd051 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -30,11 +30,18 @@ config SPARC
        select USE_GENERIC_SMP_HELPERS if SMP
        select GENERIC_PCI_IOMAP
        select HAVE_NMI_WATCHDOG if SPARC64
+       select HAVE_BPF_JIT
+       select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_CMOS_UPDATE
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_STRNCPY_FROM_USER
+       select GENERIC_STRNLEN_USER
 
 config SPARC32
        def_bool !64BIT
        select GENERIC_ATOMIC64
        select CLZ_TAB
+       select ARCH_USES_GETTIMEOFFSET
 
 config SPARC64
        def_bool 64BIT
@@ -61,6 +68,7 @@ config SPARC64
        select IRQ_PREFLOW_FASTEOI
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select HAVE_C_RECORDMCOUNT
+       select NO_BOOTMEM
 
 config ARCH_DEFCONFIG
        string
@@ -73,18 +81,6 @@ config BITS
        default 32 if SPARC32
        default 64 if SPARC64
 
-config ARCH_USES_GETTIMEOFFSET
-       bool
-       default y if SPARC32
-
-config GENERIC_CMOS_UPDATE
-       bool
-       default y
-
-config GENERIC_CLOCKEVENTS
-       bool
-       default y if SPARC64
-
 config IOMMU_HELPER
        bool
        default y if SPARC64
@@ -154,7 +150,7 @@ source "kernel/Kconfig.freezer"
 menu "Processor type and features"
 
 config SMP
-       bool "Symmetric multi-processing support (does not work on sun4/sun4c)"
+       bool "Symmetric multi-processing support"
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, say N. If you have a system with more
@@ -275,8 +271,6 @@ config HOTPLUG_CPU
          can be controlled through /sys/devices/system/cpu/cpu#.
          Say N if you want to disable CPU hotplug.
 
-source "kernel/time/Kconfig"
-
 if SPARC64
 source "drivers/cpufreq/Kconfig"
 
@@ -584,6 +578,9 @@ config SYSVIPC_COMPAT
        depends on COMPAT && SYSVIPC
        default y
 
+config KEYS_COMPAT
+       def_bool y if COMPAT && KEYS
+
 endmenu
 
 source "net/Kconfig"