[SCSI] Merge up to linux-2.6 head

[linux-2.6] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 92a7c8a..fbcc00c 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -13,6 +13,10 @@ config HIGHMEM
        bool
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 config GENERIC_ISA_DMA
        bool
        default y
@@ -166,6 +170,21 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default y
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
+config EMULATED_CMPXCHG
+       bool
+       default y
+       help
+         Sparc32 does not have a CAS instruction like sparc64. cmpxchg()
+         is emulated, and therefore it is not completely atomic.
+
 config SUN_PM
        bool
        default y