aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2011-11-24 07:54:28 -0500
committerMichael S. Tsirkin <mst@redhat.com>2011-11-24 15:21:19 -0500
commit4673ca8eb3690832e76371371955a8b02e1f59d4 (patch)
tree2d70b7ec1e33a35b9363c3a3cf986cd583c6f6e0 /arch/x86
parentcaca6a03d365883564885f2c1da3e88dcf65d139 (diff)
lib: move GENERIC_IOMAP to lib/Kconfig
define GENERIC_IOMAP in a central location instead of all architectures. This will be helpful for the follow-up patch which makes it select other configs. Code is also a bit shorter this way. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cb9a1044a771..08af6457de72 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -75,6 +75,7 @@ config X86
75 select HAVE_BPF_JIT if (X86_64 && NET) 75 select HAVE_BPF_JIT if (X86_64 && NET)
76 select CLKEVT_I8253 76 select CLKEVT_I8253
77 select ARCH_HAVE_NMI_SAFE_CMPXCHG 77 select ARCH_HAVE_NMI_SAFE_CMPXCHG
78 select GENERIC_IOMAP
78 79
79config INSTRUCTION_DECODER 80config INSTRUCTION_DECODER
80 def_bool (KPROBES || PERF_EVENTS) 81 def_bool (KPROBES || PERF_EVENTS)
@@ -140,9 +141,6 @@ config NEED_SG_DMA_LENGTH
140config GENERIC_ISA_DMA 141config GENERIC_ISA_DMA
141 def_bool ISA_DMA_API 142 def_bool ISA_DMA_API
142 143
143config GENERIC_IOMAP
144 def_bool y
145
146config GENERIC_BUG 144config GENERIC_BUG
147 def_bool y 145 def_bool y
148 depends on BUG 146 depends on BUG