aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/arch-v32/drivers/Kconfig
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.lan>2008-07-28 15:15:46 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-07-28 15:15:46 -0700
commit756f7bc6683916177e8176f8d3fa5f4c11c88afc (patch)
treecbe3ffc375950b016198fa61dea63bb449c59c93 /arch/cris/arch-v32/drivers/Kconfig
parent979b1791e5b8f8b556faeec4c48339e7ed63af9f (diff)
parentcb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (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 'arch/cris/arch-v32/drivers/Kconfig')
-rw-r--r--arch/cris/arch-v32/drivers/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 2a92cb1886c..7a64fcef9d0 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -641,6 +641,7 @@ config PCI
bool
depends on ETRAX_CARDBUS
default y
+ select HAVE_GENERIC_DMA_COHERENT
config ETRAX_IOP_FW_LOAD
tristate "IO-processor hotplug firmware loading support"