diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-16 09:13:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-16 09:13:08 +0200 |
| commit | 581abbaa03367f0b1327521f30bd2b69b8075b2f (patch) | |
| tree | 686db8cee890fa97061baf5722c3bb9344e658dc /sound/core/Makefile | |
| parent | 84add303ef950b8d85f54bc2248c2bc73467c329 (diff) | |
| parent | 639db596165746ca87bbcb56559b094fd9042890 (diff) | |
| download | linux-581abbaa03367f0b1327521f30bd2b69b8075b2f.tar.bz2 | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/core/Makefile')
| -rw-r--r-- | sound/core/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile index 48ab4b8f8279..e85d9dd12c2d 100644 --- a/sound/core/Makefile +++ b/sound/core/Makefile @@ -37,7 +37,6 @@ obj-$(CONFIG_SND) += snd.o obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o obj-$(CONFIG_SND_TIMER) += snd-timer.o obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o -obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o obj-$(CONFIG_SND_PCM) += snd-pcm.o obj-$(CONFIG_SND_DMAENGINE_PCM) += snd-pcm-dmaengine.o obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o |