aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar2009-03-13 02:14:25 +0100
committerIngo Molnar2009-03-13 02:14:25 +0100
commit25d500067d5a666d1336598d1b324793554e5496 (patch)
tree3402308c4c69a66d02ce55f5c165e242fad2a8a9 /arch/ia64/Kconfig
parent0b13fda1e0936b3d64c4c407f183d33fa6bd2ad4 (diff)
parent9ead64974b05501bbac0d63a47c99fa786d064ba (diff)
Merge branch 'linus' into core/ipi
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 4eb45c012498..153e727a6e8e 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -638,6 +638,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