Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux.git] / sound / usb / mixer_quirks.c

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index b9f5a9c18040e506eb7d72a28870bc61c14c3b36..c237e24f08d9bbf51f7b7ce16f5ddb4ffe92a9a0 100644 (file)
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -1691,7 +1691,7 @@ static const struct snd_kcontrol_new snd_microii_mixer_spdif[] = {
 static int snd_microii_controls_create(struct usb_mixer_interface *mixer)
 {
        int err, i;
-       const static usb_mixer_elem_resume_func_t resume_funcs[] = {
+       static const usb_mixer_elem_resume_func_t resume_funcs[] = {
                snd_microii_spdif_default_update,
                NULL,
                snd_microii_spdif_switch_update