aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-05-03 17:07:24 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-20 08:26:27 -0700
commit2f540fd1bb9eb6a68a07d962b00289ab2ae2862a (patch)
tree966c5adce767fb1aa835ce90d2dd614846c7efa4
parent7b21e1ddaec61bfaf0540dff5d6a822c9abb04ee (diff)
downloadlinux-linaro-stable-2f540fd1bb9eb6a68a07d962b00289ab2ae2862a.tar.gz
sound: Fix make allmodconfig on MIPS
commit d4702b189c6b951c1cb3260036ff998f719bfb62 upstream. The compile of soundcard.c is broken on MIPS when allmodconfig is used because of the missing MAX_DMA_CHANNELS definition. As a simple workaround, just add a Kconfig dependency. Reported-by: Andrew Morton <akpm@linux-foundation.org> Cc: Ralf Baechle <ralf@linux-mips.org> 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/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 5849b129e50d..51c4ba95a32d 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -250,6 +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
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