Merge branch 'for-next' into for-linus

[sfrench/cifs-2.6.git] / sound / drivers / Makefile

diff --git a/sound/drivers/Makefile b/sound/drivers/Makefile
index 615558a281c8f7f08f422babd4c31c366326a9a6..c0fe4eccdaef1ec57cedc16eafb443ebdb6d8a33 100644 (file)
--- a/sound/drivers/Makefile
+++ b/sound/drivers/Makefile
@@ -11,7 +11,6 @@ snd-mts64-objs := mts64.o
 snd-portman2x4-objs := portman2x4.o
 snd-serial-u16550-objs := serial-u16550.o
 snd-virmidi-objs := virmidi.o
 snd-portman2x4-objs := portman2x4.o
 snd-serial-u16550-objs := serial-u16550.o
 snd-virmidi-objs := virmidi.o

-snd-ml403-ac97cr-objs := ml403-ac97cr.o pcm-indirect2.o

 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_DUMMY) += snd-dummy.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_DUMMY) += snd-dummy.o


@@ -21,6 +20,5 @@ obj-$(CONFIG_SND_SERIAL_U16550) += snd-serial-u16550.o
 obj-$(CONFIG_SND_MTPAV) += snd-mtpav.o
 obj-$(CONFIG_SND_MTS64) += snd-mts64.o
 obj-$(CONFIG_SND_PORTMAN2X4) += snd-portman2x4.o
 obj-$(CONFIG_SND_MTPAV) += snd-mtpav.o
 obj-$(CONFIG_SND_MTS64) += snd-mts64.o
 obj-$(CONFIG_SND_PORTMAN2X4) += snd-portman2x4.o

-obj-$(CONFIG_SND_ML403_AC97CR) += snd-ml403-ac97cr.o

 
 obj-$(CONFIG_SND) += opl3/ opl4/ mpu401/ vx/ pcsp/
 
 obj-$(CONFIG_SND) += opl3/ opl4/ mpu401/ vx/ pcsp/