Merge branch 'for-next' into for-linus

4.18-rc1 merge material.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

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 {