diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 11:59:29 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 11:59:29 +0200 |
commit | 5e8aa85253513b9c1ade8bd71dc341218a752a65 (patch) | |
tree | 84240b7f72fefb805c78300de0ae23b7b96bf5c2 /sound/isa/sb/Makefile | |
parent | 7bd9db83087aecef8279c0b8b9dfef4db4a8fc3c (diff) | |
parent | 550a8b691ca67761bbf382d98fbd81d215f1d7f0 (diff) | |
download | linux-rt-5e8aa85253513b9c1ade8bd71dc341218a752a65.tar.gz |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/isa/sb/Makefile')
-rw-r--r-- | sound/isa/sb/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/isa/sb/Makefile b/sound/isa/sb/Makefile index af3669681788..08b9fb974658 100644 --- a/sound/isa/sb/Makefile +++ b/sound/isa/sb/Makefile @@ -11,7 +11,6 @@ snd-sb8-objs := sb8.o snd-sb16-objs := sb16.o snd-sbawe-objs := sbawe.o emu8000.o snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o -snd-es968-objs := es968.o snd-jazz16-objs := jazz16.o # Toplevel Module Dependency @@ -21,7 +20,6 @@ obj-$(CONFIG_SND_SB8_DSP) += snd-sb8-dsp.o obj-$(CONFIG_SND_SB8) += snd-sb8.o obj-$(CONFIG_SND_SB16) += snd-sb16.o obj-$(CONFIG_SND_SBAWE) += snd-sbawe.o -obj-$(CONFIG_SND_ES968) += snd-es968.o obj-$(CONFIG_SND_JAZZ16) += snd-jazz16.o ifeq ($(CONFIG_SND_SB16_CSP),y) obj-$(CONFIG_SND_SB16) += snd-sb16-csp.o |