summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2016-11-12 09:36:01 +0100
committerTakashi Iwai <tiwai@suse.de>2016-11-12 10:12:00 +0100
commit658355b599c700c9826f581d087cbd9c26c2cb56 (patch)
treedc5ae1244eb716315b2b1f8975622ea1d0c54f77 /sound/core
parent7e1b23b07825dd46c56b249370eec809fcc9d877 (diff)
downloadop-kernel-dev-658355b599c700c9826f581d087cbd9c26c2cb56.zip
op-kernel-dev-658355b599c700c9826f581d087cbd9c26c2cb56.tar.gz
ALSA: oss: don't opencode IS_REACHABLE()
Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/oss/pcm_oss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index ebc9fdf..698a014 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2501,7 +2501,7 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long
return put_user(SNDRV_OSS_VERSION, p);
if (cmd == OSS_ALSAEMULVER)
return put_user(1, p);
-#if defined(CONFIG_SND_MIXER_OSS) || (defined(MODULE) && defined(CONFIG_SND_MIXER_OSS_MODULE))
+#if IS_REACHABLE(CONFIG_SND_MIXER_OSS)
if (((cmd >> 8) & 0xff) == 'M') { /* mixer ioctl - for OSS compatibility */
struct snd_pcm_substream *substream;
int idx;
OpenPOWER on IntegriCloud