summaryrefslogtreecommitdiff
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-27 11:04:43 +0300
committerIngo Molnar <mingo@elte.hu>2009-02-27 11:04:43 +0300
commitf701d354075914296474d062f18fc8ee681a2318 (patch)
tree4c39db49f4bc9827a1a0dabc6a83fb30bd2c7ac4 /arch/ia64/Kconfig
parent1b49061d400c9e51e3ac2aac026a099fe599b9bb (diff)
parent64e71303e44f3697e4568147caa966de74bdb4fb (diff)
downloadlinux-f701d354075914296474d062f18fc8ee681a2318.tar.xz
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r--arch/ia64/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 5b2a2379a439..294a3b13ecac 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -641,6 +641,17 @@ config DMAR
and include PCI device scope covered by these DMA
remapping devices.
+config DMAR_DEFAULT_ON
+ def_bool y
+ prompt "Enable DMA Remapping Devices by default"
+ depends on DMAR
+ help
+ Selecting this option will enable a DMAR device at boot time if
+ one is found. If this option is not selected, DMAR support can
+ be enabled by passing intel_iommu=on to the kernel. It is
+ recommended you say N here while the DMAR code remains
+ experimental.
+
endmenu
endif