diff options
author | David S. Miller <davem@davemloft.net> | 2010-10-21 00:54:21 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-21 00:54:21 -0700 |
commit | 4c2a1b86644a6f3fc6b788d3a591563aff71f836 (patch) | |
tree | f615b0d88e2039ebc0ada2daf5009411f43febb9 /arch/mips/Kconfig | |
parent | e2269308359d5863b6aa1fcb95a425a2ab255f1f (diff) | |
parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
download | blackbird-op-linux-4c2a1b86644a6f3fc6b788d3a591563aff71f836.tar.gz blackbird-op-linux-4c2a1b86644a6f3fc6b788d3a591563aff71f836.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 5526faabfc21..4c9f402295dd 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -881,11 +881,15 @@ config NO_IOPORT config GENERIC_ISA_DMA bool select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n + select ISA_DMA_API config GENERIC_ISA_DMA_SUPPORT_BROKEN bool select GENERIC_ISA_DMA +config ISA_DMA_API + bool + config GENERIC_GPIO bool |