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 /init | |
parent | 979b1791e5b8f8b556faeec4c48339e7ed63af9f (diff) | |
parent | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (diff) |
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 'init')
-rw-r--r-- | init/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 43d6989c275..250e02c8f8f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -802,6 +802,10 @@ config PROC_PAGE_MONITOR endmenu # General setup +config HAVE_GENERIC_DMA_COHERENT + bool + default n + config SLABINFO bool depends on PROC_FS |