diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-19 02:53:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-19 02:53:57 -0400 |
commit | 0702b30dd821ac8a4103ddbe545518713fdca9be (patch) | |
tree | 8ce0c9f5e58c5ccb99870505eecd139986caa05e /arch/x86/Kconfig | |
parent | 192d7a4667c6d11d1a174ec4cad9a3c5d5f9043c (diff) | |
parent | a1e4ee22863d41a6fbb24310d7951836cb6dafe7 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 73f7fe8fd4d1..bc2fbadff9f9 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1802,6 +1802,17 @@ config DMAR | |||
1802 | and include PCI device scope covered by these DMA | 1802 | and include PCI device scope covered by these DMA |
1803 | remapping devices. | 1803 | remapping devices. |
1804 | 1804 | ||
1805 | config DMAR_DEFAULT_ON | ||
1806 | def_bool y | ||
1807 | prompt "Enable DMA Remapping Devices by default" | ||
1808 | depends on DMAR | ||
1809 | help | ||
1810 | Selecting this option will enable a DMAR device at boot time if | ||
1811 | one is found. If this option is not selected, DMAR support can | ||
1812 | be enabled by passing intel_iommu=on to the kernel. It is | ||
1813 | recommended you say N here while the DMAR code remains | ||
1814 | experimental. | ||
1815 | |||
1805 | config DMAR_GFX_WA | 1816 | config DMAR_GFX_WA |
1806 | def_bool y | 1817 | def_bool y |
1807 | prompt "Support for Graphics workaround" | 1818 | prompt "Support for Graphics workaround" |