diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /drivers/sound | |
parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'drivers/sound')
-rw-r--r-- | drivers/sound/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/sound/Makefile b/drivers/sound/Makefile index 399148c74..879951c4c 100644 --- a/drivers/sound/Makefile +++ b/drivers/sound/Makefile @@ -92,11 +92,11 @@ endif ifeq ($(CONFIG_DMASOUND),y) SUB_DIRS += dmasound - MOD_SUB_DIRS += dmasound + MOD_IN_SUB_DIRS += dmasound obj-y += dmasound/dmasound.o else ifeq ($(CONFIG_DMASOUND),m) - MOD_SUB_DIRS += dmasound + MOD_IN_SUB_DIRS += dmasound endif endif @@ -148,7 +148,6 @@ obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y) # Translate to Rules.make lists. O_TARGET := sounddrivers.o -MOD_LIST_NAME := SOUND_MODULES O_OBJS := $(filter-out $(export-objs), $(obj-y)) OX_OBJS := $(filter $(export-objs), $(obj-y)) |