tools include uapi: Update asound.h copy

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Oct 31, 2018

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2018-10-31 22:07 UTC #0 lore raw

Commit-ID:  89eb1f3b7f2a9156ce6f78713d7924c1bb2fab9f
Gitweb:     https://git.kernel.org/tip/89eb1f3b7f2a9156ce6f78713d7924c1bb2fab9f
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 30 Oct 2018 14:20:07 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 31 Oct 2018 09:57:52 -0300

tools include uapi: Update asound.h copy

To silence this perf build warning:

Warning: Kernel ABI header at 'tools/include/uapi/sound/asound.h' differs from latest version at 'include/uapi/sound/asound.h' diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h

Due to this cset:

a98401518def ("ALSA: timer: fix wrong comment to refer to 'SNDRV_TIMER_PSFLG_*'")

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Takashi Sakamoto <[email protected]>

Cc Takashi Iwai <[email protected]>

Link https://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/include/uapi/sound/asound.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

tools/include/uapi/sound/asound.h +1 -1

index ed0a120d4f08..404d4b9ffe76 100644
@@ -752,7 +752,7 @@ struct snd_timer_info {
 #define SNDRV_TIMER_PSFLG_EARLY_EVENT	(1<<2)	/* write early event to the poll queue */
 
 struct snd_timer_params {
-	unsigned int flags;		/* flags - SNDRV_MIXER_PSFLG_* */
+	unsigned int flags;		/* flags - SNDRV_TIMER_PSFLG_* */
 	unsigned int ticks;		/* requested resolution in ticks */
 	unsigned int queue_size;	/* total size of queue (32-1024) */
 	unsigned int reserved0;		/* reserved, was: failure locations */