Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

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

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 6c0683d..6c49ed2 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -30,6 +30,7 @@ config SPARC
        select USE_GENERIC_SMP_HELPERS if SMP
        select GENERIC_PCI_IOMAP
        select HAVE_NMI_WATCHDOG if SPARC64
+       select HAVE_BPF_JIT if NET
 
 config SPARC32
        def_bool !64BIT
@@ -61,6 +62,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,17 +75,12 @@ 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
+       def_bool y
 
 config IOMMU_HELPER
        bool
@@ -154,7 +151,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