On Sat, 12 Nov 2016 09:36:01 +0100,
Fabian Frederick wrote:
>
> Signed-off-by: Fabian Frederick <[email protected]>
Applied, thanks.
Takashi
> ---
> sound/core/oss/pcm_oss.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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;
> --
> 2.7.4
>
