diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-18 07:44:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-18 07:44:55 +0100 |
| commit | 321051f5daf059e7290aa7d60af55482c8bb896a (patch) | |
| tree | 03705bf5ea28fc2f284228a9a621193cc9a5bb66 /sound/pci/hda/hda_generic.c | |
| parent | d9ab344336f74c012f6643ed3d1ad8ca0136de3b (diff) | |
| parent | cbbf50b22f9693218f9f0d460432266b04fc960d (diff) | |
| download | linux-stable-321051f5daf059e7290aa7d60af55482c8bb896a.tar.gz linux-stable-321051f5daf059e7290aa7d60af55482c8bb896a.tar.bz2 linux-stable-321051f5daf059e7290aa7d60af55482c8bb896a.zip | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_generic.c')
| -rw-r--r-- | sound/pci/hda/hda_generic.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index fb0582f8d725..a63c54d9d767 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -762,7 +762,8 @@ static int check_existing_control(struct hda_codec *codec, const char *type, con /* * build output mixer controls */ -static int create_output_mixers(struct hda_codec *codec, const char **names) +static int create_output_mixers(struct hda_codec *codec, + const char * const *names) { struct hda_gspec *spec = codec->spec; int i, err; @@ -780,8 +781,8 @@ static int create_output_mixers(struct hda_codec *codec, const char **names) static int build_output_controls(struct hda_codec *codec) { struct hda_gspec *spec = codec->spec; - static const char *types_speaker[] = { "Speaker", "Headphone" }; - static const char *types_line[] = { "Front", "Headphone" }; + static const char * const types_speaker[] = { "Speaker", "Headphone" }; + static const char * const types_line[] = { "Front", "Headphone" }; switch (spec->pcm_vol_nodes) { case 1: |