diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-18 13:10:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-18 13:10:36 -0700 |
| commit | 547af560ddbfe469ada2cad3009cbcfde313d73c (patch) | |
| tree | 1f97e215de2d88d90ed34db24212dab69eb300b2 /arch/mips/Kconfig | |
| parent | b0579fc089808b68c53a6a95d043db034468116c (diff) | |
| parent | a35bee8a2748abe9a40865f477aba0a9b85965fd (diff) | |
| download | op-kernel-dev-547af560ddbfe469ada2cad3009cbcfde313d73c.zip op-kernel-dev-547af560ddbfe469ada2cad3009cbcfde313d73c.tar.gz | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: Enable ISA_DMA_API config to fix build failure
MIPS: 32-bit: Fix build failure in asm/fcntl.h
MIPS: Remove all generated vmlinuz* files on "make clean"
MIPS: do_sigaltstack() expects userland pointers
MIPS: Fix error values in case of bad_stack
MIPS: Sanitize restart logics
MIPS: secure_computing, syscall audit: syscall number should in r2, not r0.
MIPS: Don't block signals if we'd failed to setup a sigframe
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 5526faa..4c9f402 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 |
