patch-2.1.115 linux/drivers/sound/Makefile

• Lines: 32
• Date: Tue Aug 4 16:49:18 1998
• Orig file: v2.1.114/linux/drivers/sound/Makefile
• Orig date: Mon Aug 3 12:45:46 1998

diff -u --recursive --new-file v2.1.114/linux/drivers/sound/Makefile linux/drivers/sound/Makefile
@@ -40,13 +40,20 @@
 
 # Each configuration option enables a list of files.
 
+obj-$(CONFIG_SOUND)		+= soundcore.o
+
 ifeq ($(ARCH),m68k)
 
-obj-$(CONFIG_DMASOUND)		+= dmasound.o sound_core.o
+obj-$(CONFIG_DMASOUND)		+= dmasound.o
+
+else
+
+ifeq ($(CONFIG_PMAC),y)
+
+obj-$(CONFIG_DMASOUND)		+= dmasound.o
 
 else
 
-obj-$(CONFIG_SOUND)		+= soundcore.o
 obj-$(CONFIG_SOUND_OSS)		+= sound.o
 obj-$(CONFIG_SOUND_ADLIB)	+= adlib_card.o opl3.o
 obj-$(CONFIG_SOUND_CS4232)	+= cs4232.o ad1848.o 
@@ -83,7 +90,7 @@
 obj-$(CONFIG_SOUND_SONICVIBES)	+= sonicvibes.o
 
 endif
-
+endif
 
 
 # Declare multi-part drivers.