patch-1.3.58 linux/drivers/sound/.objects

Next file: linux/drivers/sound/.version
Previous file: linux/drivers/sound/.blurb
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.57/linux/drivers/sound/.objects linux/drivers/sound/.objects
@@ -64,14 +64,10 @@
 	OBJS := $(OBJS)  pss.o
 endif
 
-ifdef CONFIG_SB16
-	OBJS := $(OBJS)  sb16_dsp.o
-endif
-
 ifdef CONFIG_SB
 	OBJS := $(OBJS)  sb16_midi.o sb_card.o sb_dsp.o sb_midi.o sb_mixer.o
 	OBJS := $(OBJS)  sb_card.o
-	OBJS := $(OBJS)  sb_dsp.o
+	OBJS := $(OBJS)  sb_dsp.o sb16_dsp.o
 	OBJS := $(OBJS)  sb_midi.o
 	OBJS := $(OBJS)  sb_mixer.o
 endif
@@ -92,12 +88,12 @@
 	OBJS := $(OBJS)  sscape.o
 endif
 
-ifdef CONFIG_SEQUENCER
-	OBJS := $(OBJS)  sys_timer.o
-endif
-
 ifdef CONFIG_TRIX
 	OBJS := $(OBJS)  trix.o
+endif
+
+ifdef CONFIG_SEQUENCER
+	OBJS := $(OBJS)  sys_timer.o
 endif
 
 ifdef CONFIG_UART6850

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this