diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-08-08 09:20:48 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 09:58:30 -0400 |
| commit | 887f9f0253ba4a52f38810f3056cdf040a6157b3 (patch) | |
| tree | 279fa93ac9f0977e0f0aed5f331e155c51f59cff /sound/core/oss/Makefile | |
| parent | a110133d4c56a56d927e4fba68317212969fddbd (diff) | |
[ALSA] Remove ifdefs from OSS PCM emulation codes
Fix Makefile to compile files conditionally to CONFIG_SND_PCM_OSS_PLUGINS,
and remove unneeded ifdefs in these files.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/core/oss/Makefile')
| -rw-r--r-- | sound/core/oss/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/core/oss/Makefile b/sound/core/oss/Makefile index e6d5a045ba27..578052540455 100644 --- a/sound/core/oss/Makefile +++ b/sound/core/oss/Makefile | |||
| @@ -5,8 +5,9 @@ | |||
| 5 | 5 | ||
| 6 | snd-mixer-oss-objs := mixer_oss.o | 6 | snd-mixer-oss-objs := mixer_oss.o |
| 7 | 7 | ||
| 8 | snd-pcm-oss-objs := pcm_oss.o pcm_plugin.o \ | 8 | snd-pcm-oss-y := pcm_oss.o |
| 9 | io.o copy.o linear.o mulaw.o route.o rate.o | 9 | snd-pcm-oss-$(CONFIG_SND_PCM_OSS_PLUGINS) += pcm_plugin.o \ |
| 10 | io.o copy.o linear.o mulaw.o route.o rate.o | ||
| 10 | 11 | ||
| 11 | obj-$(CONFIG_SND_MIXER_OSS) += snd-mixer-oss.o | 12 | obj-$(CONFIG_SND_MIXER_OSS) += snd-mixer-oss.o |
| 12 | obj-$(CONFIG_SND_PCM_OSS) += snd-pcm-oss.o | 13 | obj-$(CONFIG_SND_PCM_OSS) += snd-pcm-oss.o |