Merge branch 'for-next' into for-linus

[sfrench/cifs-2.6.git] / sound / usb / mixer_us16x08.c

diff --git a/sound/usb/mixer_us16x08.c b/sound/usb/mixer_us16x08.c
index a4d4d71db55b2cce31c5607c33586629cf5ead81..92b1a6d9c931959b16508464ff355c466a4b16ac 100644 (file)
--- a/sound/usb/mixer_us16x08.c
+++ b/sound/usb/mixer_us16x08.c
@@ -1109,7 +1109,7 @@ static const struct snd_us16x08_control_params eq_controls[] = {
                .control_id = SND_US16X08_ID_EQLOWFREQ,
                .type = USB_MIXER_U8,
                .num_channels = 16,
-               .name = "EQ Low Frequence",
+               .name = "EQ Low Frequency",
        },
        { /* EQ mid low gain */
                .kcontrol_new = &snd_us16x08_eq_gain_ctl,
@@ -1123,7 +1123,7 @@ static const struct snd_us16x08_control_params eq_controls[] = {
                .control_id = SND_US16X08_ID_EQLOWMIDFREQ,
                .type = USB_MIXER_U8,
                .num_channels = 16,
-               .name = "EQ MidLow Frequence",
+               .name = "EQ MidLow Frequency",
        },
        { /* EQ mid low Q */
                .kcontrol_new = &snd_us16x08_eq_mid_width_ctl,
@@ -1144,7 +1144,7 @@ static const struct snd_us16x08_control_params eq_controls[] = {
                .control_id = SND_US16X08_ID_EQHIGHMIDFREQ,
                .type = USB_MIXER_U8,
                .num_channels = 16,
-               .name = "EQ MidHigh Frequence",
+               .name = "EQ MidHigh Frequency",
        },
        { /* EQ mid high Q */
                .kcontrol_new = &snd_us16x08_eq_mid_width_ctl,
@@ -1165,7 +1165,7 @@ static const struct snd_us16x08_control_params eq_controls[] = {
                .control_id = SND_US16X08_ID_EQHIGHFREQ,
                .type = USB_MIXER_U8,
                .num_channels = 16,
-               .name = "EQ High Frequence",
+               .name = "EQ High Frequency",
        },
 };