diff --git a/[refs] b/[refs] index f08522c58463..52d656c8c00f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec08b14483de0702ca43e3a8506e149486975f9b +refs/heads/master: 217658f46c2dbfe260f8f5976f2a201911a2f4c6 diff --git a/trunk/sound/core/pcm_lib.c b/trunk/sound/core/pcm_lib.c index c8c8091f9a71..abfeff1611ce 100644 --- a/trunk/sound/core/pcm_lib.c +++ b/trunk/sound/core/pcm_lib.c @@ -266,7 +266,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream) #else /* ! CONFIG_SND_PCM_XRUN_DEBUG */ #define hw_ptr_error(substream, fmt, args...) do { } while (0) -#define xrun_log(substream, pos) do { } while (0) +#define xrun_log(substream, pos, in_interrupt) do { } while (0) #define xrun_log_show(substream) do { } while (0) #endif