aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2013-05-12 14:31:19 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-20 08:26:27 -0700
commit9eae33247abc89486e375d3ae64702ad25aa08e6 (patch)
treec68fdd26d6697ff5247cd363e3478216ef998bde
parent2f540fd1bb9eb6a68a07d962b00289ab2ae2862a (diff)
downloadlinux-linaro-stable-9eae33247abc89486e375d3ae64702ad25aa08e6.tar.gz
sound: Fix make allmodconfig on MIPS correctly
commit a62ee234a572b4c98fe98cf5fb18e4e8b0f6e43d upstream. Commit d4702b189c ("sound: Fix make allmodconfig on MIPS") added a (negative) dependency on ISA_DMA_SUPPORT_BROKEN. Since that Kconfig symbol doesn't exist, this dependency will always evaluate to true. Apparently GENERIC_ISA_DMA_SUPPORT_BROKEN was meant to be used here. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Takashi Iwai <tiwai@suse.de> Cc: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/oss/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 51c4ba95a32d..1a9640254433 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -250,7 +250,7 @@ config MSND_FIFOSIZE
menuconfig SOUND_OSS
tristate "OSS sound modules"
depends on ISA_DMA_API && VIRT_TO_BUS
- depends on !ISA_DMA_SUPPORT_BROKEN
+ depends on !GENERIC_ISA_DMA_SUPPORT_BROKEN
help
OSS is the Open Sound System suite of sound card drivers. They make
sound programming easier since they provide a common API. Say Y or