diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-06-04 11:41:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-06-04 11:42:27 +0200 |
| commit | cdbc653a04ee692a7105a96e8dd6055d9971d45c (patch) | |
| tree | c1282680b3115edfd693a27bc6758208534ac557 /include/sound/core.h | |
| parent | 009f8c90f571d87855914dbc20e6c0ea2a3b19ae (diff) | |
| parent | ceec4684085a9e4dc60439d84ab47ce260444804 (diff) | |
Merge branch 'for-next' into for-linus
4.18-rc1 merge material.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/core.h')
| -rw-r--r-- | include/sound/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 5f181b875c2f..36a5934cf4b1 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -51,7 +51,6 @@ struct completion; */ enum snd_device_type { SNDRV_DEV_LOWLEVEL, - SNDRV_DEV_CONTROL, SNDRV_DEV_INFO, SNDRV_DEV_BUS, SNDRV_DEV_CODEC, @@ -62,6 +61,7 @@ enum snd_device_type { SNDRV_DEV_SEQUENCER, SNDRV_DEV_HWDEP, SNDRV_DEV_JACK, + SNDRV_DEV_CONTROL, /* NOTE: this must be the last one */ }; enum snd_device_state { |