summaryrefslogtreecommitdiff
path: root/sound/core/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-30 03:01:43 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-30 03:01:43 +0400
commitda61396d24e37258817e42537c482e962b4742f7 (patch)
tree4293a5d557b8f9fed8a2bac93f1e5c939c7b65c3 /sound/core/Makefile
parent2f058256cb64e346f4fb4499ff4e0f1c2791a4b4 (diff)
parent8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff)
downloadlinux-da61396d24e37258817e42537c482e962b4742f7.tar.xz
Merge upstream kernel into libata 'passthru' branch
Diffstat (limited to 'sound/core/Makefile')
-rw-r--r--sound/core/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile
index 764ac184b223..969d75528bde 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)