diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-03 10:18:47 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-03 10:18:47 -0500 |
| commit | d4fc7cea5dda04ae1a6f36175ec1dd8ff088ed52 (patch) | |
| tree | 3d65887b06c575a94feed1fd91216e32a62b31d8 /arch/x86/Kconfig | |
| parent | 3a011a171906a3a51a43bb860fb7c66a64cab140 (diff) | |
| parent | 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 9c39095b33fc..bc2fbadff9f9 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1803,7 +1803,7 @@ config DMAR | |||
| 1803 | remapping devices. | 1803 | remapping devices. |
| 1804 | 1804 | ||
| 1805 | config DMAR_DEFAULT_ON | 1805 | config DMAR_DEFAULT_ON |
| 1806 | def_bool n | 1806 | def_bool y |
| 1807 | prompt "Enable DMA Remapping Devices by default" | 1807 | prompt "Enable DMA Remapping Devices by default" |
| 1808 | depends on DMAR | 1808 | depends on DMAR |
| 1809 | help | 1809 | help |