diff options
author | 2009-02-27 09:04:43 +0100 | |
---|---|---|
committer | 2009-02-27 09:04:43 +0100 | |
commit | f701d354075914296474d062f18fc8ee681a2318 (patch) | |
tree | 4c39db49f4bc9827a1a0dabc6a83fb30bd2c7ac4 /arch/ia64/Kconfig | |
parent | Merge branch 'sched/clock' into tracing/ftrace (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
download | linux-f701d354075914296474d062f18fc8ee681a2318.tar.gz linux-f701d354075914296474d062f18fc8ee681a2318.tar.bz2 linux-f701d354075914296474d062f18fc8ee681a2318.zip |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r-- | arch/ia64/Kconfig | 11 |
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 |