diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-03-28 08:33:20 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-03-28 08:33:50 +0100 |
| commit | 3a23fd0415cbd074b726fe730747d1bb41f8d0d7 (patch) | |
| tree | d8037fcf64554593b659b731a62209766f70b542 /include/sound | |
| parent | 36b8defc447627c3e91058c43941ec15d827556e (diff) | |
| parent | fe1b26c93d430400ac37d820425e2468218ae8b2 (diff) | |
| download | linux-3a23fd0415cbd074b726fe730747d1bb41f8d0d7.tar.gz linux-3a23fd0415cbd074b726fe730747d1bb41f8d0d7.tar.bz2 linux-3a23fd0415cbd074b726fe730747d1bb41f8d0d7.zip | |
Merge branch 'topic/timer-fixes' into for-next
Pull yet another ALSA core timer fixes and cleanups.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/timer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/timer.h b/include/sound/timer.h index 7ae226ab6990..bcfee20ea226 100644 --- a/include/sound/timer.h +++ b/include/sound/timer.h @@ -43,7 +43,6 @@ #define SNDRV_TIMER_IFLG_START 0x00000004 #define SNDRV_TIMER_IFLG_AUTO 0x00000008 /* auto restart */ #define SNDRV_TIMER_IFLG_FAST 0x00000010 /* fast callback (do not use tasklet) */ -#define SNDRV_TIMER_IFLG_CALLBACK 0x00000020 /* timer callback is active */ #define SNDRV_TIMER_IFLG_EXCLUSIVE 0x00000040 /* exclusive owner - no more instances */ #define SNDRV_TIMER_IFLG_EARLY_EVENT 0x00000080 /* write early event to the poll queue */ |