summaryrefslogtreecommitdiffstats
path: root/drivers/sound/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sound/Makefile')
-rw-r--r--drivers/sound/Makefile16
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/sound/Makefile b/drivers/sound/Makefile
index 046379d37..876daf485 100644
--- a/drivers/sound/Makefile
+++ b/drivers/sound/Makefile
@@ -35,7 +35,6 @@ obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_SOUND) += soundcore.o
-obj-$(CONFIG_DMASOUND) += dmasound.o
obj-$(CONFIG_SOUND_OSS) += sound.o
obj-$(CONFIG_SOUND_CS4232) += cs4232.o ad1848.o
@@ -81,6 +80,17 @@ obj-$(CONFIG_SOUND_ESSSOLO1) += esssolo1.o
obj-$(CONFIG_SOUND_MAESTRO) += maestro.o
obj-$(CONFIG_SOUND_TRIDENT) += trident.o ac97_codec.o
+ifeq ($(CONFIG_DMASOUND),y)
+ SUB_DIRS += dmasound
+ MOD_SUB_DIRS += dmasound
+ obj-y += dmasound/dmasound.o
+else
+ ifeq ($(CONFIG_DMASOUND),m)
+ MOD_SUB_DIRS += dmasound
+ endif
+endif
+
+
# Declare multi-part drivers.
list-multi := sound.o gus.o pas2.o sb.o sb_lib.o softoss2.o vidc_mod.o \
@@ -138,10 +148,6 @@ MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m)))
MIX_OBJS := $(sort $(filter $(export-objs), $(int-m)))
-ifeq ($(CONFIG_LOWLEVEL_SOUND),y)
- O_OBJS += lowlevel/lowlevel.o
-endif
-
include $(TOPDIR)/Rules.make