diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 13:42:31 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 13:42:31 +0300 |
commit | 8163d88c79dca35478a2405c837733ac50ea4c39 (patch) | |
tree | 6acae066a09b7dcbedab4a35ad62eba4ba3fd83c /arch/x86/Kconfig | |
parent | a1ef58f442542d8b3e3b963339fbc522c36e827c (diff) | |
parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
download | linux-8163d88c79dca35478a2405c837733ac50ea4c39.tar.xz |
Merge commit 'v2.6.29-rc7' into perfcounters/core
Conflicts:
arch/x86/mm/iomap_32.c
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 2535427020b5..e18dfd3c3b7f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1823,7 +1823,7 @@ config DMAR remapping devices. config DMAR_DEFAULT_ON - def_bool n + def_bool y prompt "Enable DMA Remapping Devices by default" depends on DMAR help |