summaryrefslogtreecommitdiffstats
path: root/sound/core/info_oss.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-23 10:34:34 +0200
committerTakashi Iwai <tiwai@suse.de>2015-04-24 17:31:07 +0200
commit85d143180738475b89d76b18409c3125b01464e1 (patch)
tree5ed3cd2abb50eebcd6f7ae68dc42eab42d64235f /sound/core/info_oss.c
parentb591b6e9e99017137888e2e397f0ddd8adb77c5d (diff)
downloadlinux-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/info_oss.c')
-rw-r--r--sound/core/info_oss.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index 83c29dbff9c0..bd4d2c6233c2 100644
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -29,8 +29,6 @@
#include <linux/utsname.h>
#include <linux/mutex.h>
-#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
-
/*
* OSS compatible part
*/
@@ -134,5 +132,3 @@ int snd_info_minor_unregister(void)
snd_sndstat_proc_entry = NULL;
return 0;
}
-
-#endif /* CONFIG_SND_OSSEMUL */