diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 03:56:32 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 03:56:32 -0400 |
| commit | 79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (patch) | |
| tree | e32a4c267dc1b5950012e18c1e71d8057140f1f5 /sound/isa/Makefile | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
| parent | 97c44b2dbd0060e2e6bd56236eb638ab02ec7f30 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/isa/Makefile')
| -rw-r--r-- | sound/isa/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/isa/Makefile b/sound/isa/Makefile index c73d30c4f462..8d781e419e2e 100644 --- a/sound/isa/Makefile +++ b/sound/isa/Makefile | |||
| @@ -10,7 +10,6 @@ snd-cmi8330-objs := cmi8330.o | |||
| 10 | snd-es18xx-objs := es18xx.o | 10 | snd-es18xx-objs := es18xx.o |
| 11 | snd-opl3sa2-objs := opl3sa2.o | 11 | snd-opl3sa2-objs := opl3sa2.o |
| 12 | snd-sc6000-objs := sc6000.o | 12 | snd-sc6000-objs := sc6000.o |
| 13 | snd-sgalaxy-objs := sgalaxy.o | ||
| 14 | snd-sscape-objs := sscape.o | 13 | snd-sscape-objs := sscape.o |
| 15 | 14 | ||
| 16 | # Toplevel Module Dependency | 15 | # Toplevel Module Dependency |
| @@ -21,8 +20,7 @@ obj-$(CONFIG_SND_CMI8330) += snd-cmi8330.o | |||
| 21 | obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o | 20 | obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o |
| 22 | obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o | 21 | obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o |
| 23 | obj-$(CONFIG_SND_SC6000) += snd-sc6000.o | 22 | obj-$(CONFIG_SND_SC6000) += snd-sc6000.o |
| 24 | obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o | ||
| 25 | obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o | 23 | obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o |
| 26 | 24 | ||
| 27 | obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ msnd/ opti9xx/ \ | 25 | obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ galaxy/ gus/ msnd/ opti9xx/ \ |
| 28 | sb/ wavefront/ wss/ | 26 | sb/ wavefront/ wss/ |