diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-27 17:42:45 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-27 17:42:45 +0300 |
| commit | f1a77547c21fe942e95ebaadbc9200f26d138574 (patch) | |
| tree | 3b217b2827e30c840f0747d2cfb861baa656a417 /sound/core/Makefile | |
| parent | 30e5f003ff4b2be86f71733b6c9b11355d66584c (diff) | |
| parent | 8ab418d3651b14d38498d868617a7280ccc6de08 (diff) | |
| download | linux-f1a77547c21fe942e95ebaadbc9200f26d138574.tar.xz | |
Merge branch 'for-4.2' into for-next
Diffstat (limited to 'sound/core/Makefile')
| -rw-r--r-- | sound/core/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile index 4daf2f58261c..ae1d32b084fd 100644 --- a/sound/core/Makefile +++ b/sound/core/Makefile @@ -3,9 +3,13 @@ # Copyright (c) 1999,2001 by Jaroslav Kysela <perex@perex.cz> # -snd-y := sound.o init.o memory.o info.o control.o misc.o device.o +snd-y := sound.o init.o memory.o control.o misc.o device.o +ifneq ($(CONFIG_PROC_FS),) +snd-y += info.o +snd-$(CONFIG_SND_OSSEMUL) += info_oss.o +endif snd-$(CONFIG_ISA_DMA_API) += isadma.o -snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o +snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o snd-$(CONFIG_SND_VMASTER) += vmaster.o snd-$(CONFIG_SND_KCTL_JACK) += ctljack.o snd-$(CONFIG_SND_JACK) += jack.o |