diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-16 09:13:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-16 09:13:08 +0200 |
| commit | 581abbaa03367f0b1327521f30bd2b69b8075b2f (patch) | |
| tree | 686db8cee890fa97061baf5722c3bb9344e658dc /include/uapi | |
| parent | 84add303ef950b8d85f54bc2248c2bc73467c329 (diff) | |
| parent | 639db596165746ca87bbcb56559b094fd9042890 (diff) | |
| download | linux-581abbaa03367f0b1327521f30bd2b69b8075b2f.tar.gz linux-581abbaa03367f0b1327521f30bd2b69b8075b2f.zip | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/sound/asound.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 67bf49d8c944..609cadb8739d 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -672,7 +672,7 @@ enum { /* global timers (device member) */ #define SNDRV_TIMER_GLOBAL_SYSTEM 0 -#define SNDRV_TIMER_GLOBAL_RTC 1 +#define SNDRV_TIMER_GLOBAL_RTC 1 /* unused */ #define SNDRV_TIMER_GLOBAL_HPET 2 #define SNDRV_TIMER_GLOBAL_HRTIMER 3 |