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/patch_cmedia.c | |
parent | d9ab344336f74c012f6643ed3d1ad8ca0136de3b (diff) | |
parent | cbbf50b22f9693218f9f0d460432266b04fc960d (diff) |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_cmedia.c')
-rw-r--r-- | sound/pci/hda/patch_cmedia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c index ff60908f4554..1f8bbcd0f802 100644 --- a/sound/pci/hda/patch_cmedia.c +++ b/sound/pci/hda/patch_cmedia.c @@ -608,7 +608,7 @@ static void cmi9880_free(struct hda_codec *codec) /* */ -static const char *cmi9880_models[CMI_MODELS] = { +static const char * const cmi9880_models[CMI_MODELS] = { [CMI_MINIMAL] = "minimal", [CMI_MIN_FP] = "min_fp", [CMI_FULL] = "full", |