Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / sound / pci / hda / patch_cmedia.c

diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
index ff60908f4554ad1b15bbbae2973929e25a9458ef..1f8bbcd0f80272d7f00946d32f9f1fe2d599b06b 100644 (file)
--- 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",