aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r--arch/ia64/Kconfig11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 27489b6dd533..bd7266903bf8 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -23,12 +23,16 @@ config IA64
23 select HAVE_ARCH_TRACEHOOK 23 select HAVE_ARCH_TRACEHOOK
24 select HAVE_DMA_API_DEBUG 24 select HAVE_DMA_API_DEBUG
25 select HAVE_GENERIC_HARDIRQS 25 select HAVE_GENERIC_HARDIRQS
26 select HAVE_MEMBLOCK
27 select HAVE_MEMBLOCK_NODE_MAP
28 select ARCH_DISCARD_MEMBLOCK
26 select GENERIC_IRQ_PROBE 29 select GENERIC_IRQ_PROBE
27 select GENERIC_PENDING_IRQ if SMP 30 select GENERIC_PENDING_IRQ if SMP
28 select IRQ_PER_CPU 31 select IRQ_PER_CPU
29 select GENERIC_IRQ_SHOW 32 select GENERIC_IRQ_SHOW
30 select ARCH_WANT_OPTIONAL_GPIOLIB 33 select ARCH_WANT_OPTIONAL_GPIOLIB
31 select ARCH_HAVE_NMI_SAFE_CMPXCHG 34 select ARCH_HAVE_NMI_SAFE_CMPXCHG
35 select GENERIC_IOMAP
32 default y 36 default y
33 help 37 help
34 The Itanium Processor Family is Intel's 64-bit successor to 38 The Itanium Processor Family is Intel's 64-bit successor to
@@ -102,10 +106,6 @@ config EFI
102 bool 106 bool
103 default y 107 default y
104 108
105config GENERIC_IOMAP
106 bool
107 default y
108
109config ARCH_CLOCKSOURCE_DATA 109config ARCH_CLOCKSOURCE_DATA
110 def_bool y 110 def_bool y
111 111
@@ -474,9 +474,6 @@ config NODES_SHIFT
474 MAX_NUMNODES will be 2^(This value). 474 MAX_NUMNODES will be 2^(This value).
475 If in doubt, use the default. 475 If in doubt, use the default.
476 476
477config ARCH_POPULATES_NODE_MAP
478 def_bool y
479
480# VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent. 477# VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent.
481# VIRTUAL_MEM_MAP has been retained for historical reasons. 478# VIRTUAL_MEM_MAP has been retained for historical reasons.
482config VIRTUAL_MEM_MAP 479config VIRTUAL_MEM_MAP