diff options
| author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-07-28 15:15:46 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-07-28 15:15:46 -0700 |
| commit | 756f7bc6683916177e8176f8d3fa5f4c11c88afc (patch) | |
| tree | cbe3ffc375950b016198fa61dea63bb449c59c93 /arch/x86/Kconfig | |
| parent | 979b1791e5b8f8b556faeec4c48339e7ed63af9f (diff) | |
| parent | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (diff) | |
| download | kernel_samsung_smdk4412-756f7bc6683916177e8176f8d3fa5f4c11c88afc.tar.gz kernel_samsung_smdk4412-756f7bc6683916177e8176f8d3fa5f4c11c88afc.tar.bz2 kernel_samsung_smdk4412-756f7bc6683916177e8176f8d3fa5f4c11c88afc.zip | |
Merge branch 'core/generic-dma-coherent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into for-linus
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b6fa2877b17..3d0f2b6a5a1 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -30,6 +30,7 @@ config X86 select HAVE_FTRACE select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) select HAVE_ARCH_KGDB if !X86_VOYAGER + select HAVE_GENERIC_DMA_COHERENT if X86_32 select HAVE_EFFICIENT_UNALIGNED_ACCESS config ARCH_DEFCONFIG |