diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-23 10:34:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-24 17:31:07 +0200 |
| commit | 85d143180738475b89d76b18409c3125b01464e1 (patch) | |
| tree | 5ed3cd2abb50eebcd6f7ae68dc42eab42d64235f /sound/core/sound_oss.c | |
| parent | b591b6e9e99017137888e2e397f0ddd8adb77c5d (diff) | |
| download | linux-85d143180738475b89d76b18409c3125b01464e1.tar.bz2 | |
ALSA: core: Build conditionally and remove superfluous ifdefs
Minor cleanups of Makefile to build some codes conditionally so that
a few ifdefs can be reduced.
Acked-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/sound_oss.c')
| -rw-r--r-- | sound/core/sound_oss.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c index 56d2f409f1ef..86e2d91dd375 100644 --- a/sound/core/sound_oss.c +++ b/sound/core/sound_oss.c @@ -19,12 +19,6 @@ * */ -#ifdef CONFIG_SND_OSSEMUL - -#if !IS_ENABLED(CONFIG_SOUND) -#error "Enable the OSS soundcore multiplexer (CONFIG_SOUND) in the kernel." -#endif - #include <linux/init.h> #include <linux/export.h> #include <linux/slab.h> @@ -266,5 +260,3 @@ int __init snd_minor_info_oss_init(void) return snd_info_register(entry); /* freed in error path */ } #endif /* CONFIG_PROC_FS */ - -#endif /* CONFIG_SND_OSSEMUL */ |