diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:36:15 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:36:15 -0400 |
| commit | 4c5ecb7e59662a76754efdd41c6ed4415e6e9840 (patch) | |
| tree | 8a362dd8938e06e13a7fff24e0507558e1ab25b4 /sound/isa/Makefile | |
| parent | fa15fdeffa3977b17882f485547e65296cf0bd30 (diff) | |
| parent | 5e7476243ad755fa1d8be2b1774d0aeb16bb48df (diff) | |
Merge branch 'topic/msnd' into for-linus
Diffstat (limited to 'sound/isa/Makefile')
| -rw-r--r-- | sound/isa/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/Makefile b/sound/isa/Makefile index 63af13d901a5..b906b9a1a81e 100644 --- a/sound/isa/Makefile +++ b/sound/isa/Makefile | |||
| @@ -26,5 +26,5 @@ obj-$(CONFIG_SND_SC6000) += snd-sc6000.o | |||
| 26 | obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o | 26 | obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o |
| 27 | obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o | 27 | obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o |
| 28 | 28 | ||
| 29 | obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ opti9xx/ \ | 29 | obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ msnd/ opti9xx/ \ |
| 30 | sb/ wavefront/ wss/ | 30 | sb/ wavefront/ wss/ |