aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/pxa/corgi.c6
-rw-r--r--sound/soc/pxa/magician.c2
-rw-r--r--sound/soc/pxa/poodle.c4
-rw-r--r--sound/soc/pxa/spitz.c6
-rw-r--r--sound/soc/pxa/tosa.c6
5 files changed, 12 insertions, 12 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index dcbb7aa9830c..311774e9ca46 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -244,9 +244,9 @@ static const struct snd_soc_dapm_route corgi_audio_map[] = {
244 {"MICIN", NULL, "Line Jack"}, 244 {"MICIN", NULL, "Line Jack"},
245}; 245};
246 246
247static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset", 247static const char * const jack_function[] = {"Headphone", "Mic", "Line",
248 "Off"}; 248 "Headset", "Off"};
249static const char *spk_function[] = {"On", "Off"}; 249static const char * const spk_function[] = {"On", "Off"};
250static const struct soc_enum corgi_enum[] = { 250static const struct soc_enum corgi_enum[] = {
251 SOC_ENUM_SINGLE_EXT(5, jack_function), 251 SOC_ENUM_SINGLE_EXT(5, jack_function),
252 SOC_ENUM_SINGLE_EXT(2, spk_function), 252 SOC_ENUM_SINGLE_EXT(2, spk_function),
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 62b8377a9d2b..2d4d4455fe87 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -376,7 +376,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
376 {"VINM", NULL, "Call Mic"}, 376 {"VINM", NULL, "Call Mic"},
377}; 377};
378 378
379static const char *input_select[] = {"Call Mic", "Headset Mic"}; 379static const char * const input_select[] = {"Call Mic", "Headset Mic"};
380static const struct soc_enum magician_in_sel_enum = 380static const struct soc_enum magician_in_sel_enum =
381 SOC_ENUM_SINGLE_EXT(2, input_select); 381 SOC_ENUM_SINGLE_EXT(2, input_select);
382 382
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 4b3b714f5ee7..a879aba0691f 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -209,8 +209,8 @@ static const struct snd_soc_dapm_route poodle_audio_map[] = {
209 {"MICIN", NULL, "Microphone"}, 209 {"MICIN", NULL, "Microphone"},
210}; 210};
211 211
212static const char *jack_function[] = {"Off", "Headphone"}; 212static const char * const jack_function[] = {"Off", "Headphone"};
213static const char *spk_function[] = {"Off", "On"}; 213static const char * const spk_function[] = {"Off", "On"};
214static const struct soc_enum poodle_enum[] = { 214static const struct soc_enum poodle_enum[] = {
215 SOC_ENUM_SINGLE_EXT(2, jack_function), 215 SOC_ENUM_SINGLE_EXT(2, jack_function),
216 SOC_ENUM_SINGLE_EXT(2, spk_function), 216 SOC_ENUM_SINGLE_EXT(2, spk_function),
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 0e02634c8b7f..07d77cddac60 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -241,9 +241,9 @@ static const struct snd_soc_dapm_route spitz_audio_map[] = {
241 {"LINPUT1", NULL, "Line Jack"}, 241 {"LINPUT1", NULL, "Line Jack"},
242}; 242};
243 243
244static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset", 244static const char * const jack_function[] = {"Headphone", "Mic", "Line",
245 "Off"}; 245 "Headset", "Off"};
246static const char *spk_function[] = {"On", "Off"}; 246static const char * const spk_function[] = {"On", "Off"};
247static const struct soc_enum spitz_enum[] = { 247static const struct soc_enum spitz_enum[] = {
248 SOC_ENUM_SINGLE_EXT(5, jack_function), 248 SOC_ENUM_SINGLE_EXT(5, jack_function),
249 SOC_ENUM_SINGLE_EXT(2, spk_function), 249 SOC_ENUM_SINGLE_EXT(2, spk_function),
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index c508f024ecfb..08b0cf50e91a 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -170,9 +170,9 @@ static const struct snd_soc_dapm_route audio_map[] = {
170 {"Mic Bias", NULL, "Headset Jack"}, 170 {"Mic Bias", NULL, "Headset Jack"},
171}; 171};
172 172
173static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset", 173static const char * const jack_function[] = {"Headphone", "Mic", "Line",
174 "Off"}; 174 "Headset", "Off"};
175static const char *spk_function[] = {"On", "Off"}; 175static const char * const spk_function[] = {"On", "Off"};
176static const struct soc_enum tosa_enum[] = { 176static const struct soc_enum tosa_enum[] = {
177 SOC_ENUM_SINGLE_EXT(5, jack_function), 177 SOC_ENUM_SINGLE_EXT(5, jack_function),
178 SOC_ENUM_SINGLE_EXT(2, spk_function), 178 SOC_ENUM_SINGLE_EXT(2, spk_function),