[IA64] removing redundant ifdef

[safe/jmp/linux-2.6] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 328d2f8..4d4f418 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -53,6 +53,9 @@ config MMU
        bool
        default y
 
+config NEED_DMA_MAP_STATE
+       def_bool y
+
 config SWIOTLB
        bool
 
@@ -60,9 +63,7 @@ config IOMMU_HELPER
        bool
 
 config GENERIC_LOCKBREAK
-       bool
-       default y
-       depends on SMP && PREEMPT
+       def_bool n
 
 config RWSEM_XCHGADD_ALGORITHM
        bool
@@ -89,9 +90,6 @@ config GENERIC_TIME_VSYSCALL
        bool
        default y
 
-config HAVE_LEGACY_PER_CPU_AREA
-       def_bool y
-
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y
 
@@ -115,6 +113,10 @@ config IA64_UNCACHED_ALLOCATOR
        bool
        select GENERIC_ALLOCATOR
 
+config ARCH_USES_PG_UNCACHED
+       def_bool y
+       depends on IA64_UNCACHED_ALLOCATOR
+
 config AUDIT_ARCH
        bool
        default y
@@ -496,22 +498,9 @@ config HAVE_ARCH_NODEDATA_EXTENSION
        def_bool y
        depends on NUMA
 
-config IA32_SUPPORT
-       bool "Support for Linux/x86 binaries"
-       help
-         IA-64 processors can execute IA-32 (X86) instructions.  By
-         saying Y here, the kernel will include IA-32 system call
-         emulation support which makes it possible to transparently
-         run IA-32 Linux binaries on an IA-64 Linux system.
-         If in doubt, say Y.
-
-config COMPAT
-       bool
-       depends on IA32_SUPPORT
-       default y
-
-config COMPAT_FOR_U64_ALIGNMENT
-       def_bool COMPAT
+config ARCH_PROC_KCORE_TEXT
+       def_bool y
+       depends on PROC_KCORE
 
 config IA64_MCA_RECOVERY
        tristate "MCA recovery from errors other than TLB."