Merge branch 'linus' into x86/urgent

[~andy/linux] / sound / isa / Makefile

diff --git a/sound/isa/Makefile b/sound/isa/Makefile
index 63af13d901a5f0178c42eb9953495142e895d08b..b906b9a1a81e622654fa8628f62b9547679afe77 100644 (file)
--- a/sound/isa/Makefile
+++ b/sound/isa/Makefile
@@ -26,5 +26,5 @@ obj-$(CONFIG_SND_SC6000) += snd-sc6000.o
 obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o
 obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o
 
-obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ opti9xx/ \
+obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ msnd/ opti9xx/ \
                     sb/ wavefront/ wss/