diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-01 06:47:58 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-01 06:47:58 -0500 |
| commit | 55f2b78995826d549401bdf20abeac1832636bb6 (patch) | |
| tree | 931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /arch/x86/Kconfig | |
| parent | f5c1aa1537be39d8b9bb5279b5881d81898fd3cd (diff) | |
| parent | 92b9af9e4f144535c65aee673cfad309f25fa465 (diff) | |
Merge branch 'x86/urgent' into x86/pat
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 5e2919c0ff92..d9084320279e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1822,7 +1822,7 @@ config DMAR | |||
| 1822 | remapping devices. | 1822 | remapping devices. |
| 1823 | 1823 | ||
| 1824 | config DMAR_DEFAULT_ON | 1824 | config DMAR_DEFAULT_ON |
| 1825 | def_bool n | 1825 | def_bool y |
| 1826 | prompt "Enable DMA Remapping Devices by default" | 1826 | prompt "Enable DMA Remapping Devices by default" |
| 1827 | depends on DMAR | 1827 | depends on DMAR |
| 1828 | help | 1828 | help |