summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-08-23 22:45:06 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-23 18:43:40 -0700
commit276bd31ce5af01350465861af7aa6a25864eb108 (patch)
tree5fb22ae8b2ef903d27850f7894ed669fabce96ad /sound/core
parente9bcb173dd1747075214a1ccdb65dc6320cae49d (diff)
downloadop-kernel-dev-276bd31ce5af01350465861af7aa6a25864eb108.zip
op-kernel-dev-276bd31ce5af01350465861af7aa6a25864eb108.tar.gz
[PATCH] Kconfig fix (ISA_DMA_API and sound/*)
fixed kconfig dependencies on ISA_DMA_API for parts of sound/* that rely on it. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/Makefile2
-rw-r--r--sound/core/sound.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile
index 764ac18..969d755 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -5,7 +5,7 @@
snd-objs := sound.o init.o memory.o info.o control.o misc.o \
device.o wrappers.o
-ifeq ($(CONFIG_ISA),y)
+ifeq ($(CONFIG_ISA_DMA_API),y)
snd-objs += isadma.o
endif
ifeq ($(CONFIG_SND_OSSEMUL),y)
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 7612884..3271e92 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -432,7 +432,7 @@ EXPORT_SYMBOL(snd_device_new);
EXPORT_SYMBOL(snd_device_register);
EXPORT_SYMBOL(snd_device_free);
/* isadma.c */
-#ifdef CONFIG_ISA
+#ifdef CONFIG_ISA_DMA_API
EXPORT_SYMBOL(snd_dma_program);
EXPORT_SYMBOL(snd_dma_disable);
EXPORT_SYMBOL(snd_dma_pointer);
OpenPOWER on IntegriCloud