Merge branch 'fix/hda' into for-linus

[pandora-kernel.git] / sound / pci / hda / hda_eld.c

diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index aa43856..fcad5ec 100644 (file)
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -32,14 +32,6 @@ enum eld_versions {
        ELD_VER_PARTIAL         = 31,
 };
 
-static char *eld_versoin_names[32] = {
-       "reserved",
-       "reserved",
-       "CEA-861D or below",
-       [3 ... 30] = "reserved",
-       [31] = "partial"
-};
-
 enum cea_edid_versions {
        CEA_EDID_VER_NONE       = 0,
        CEA_EDID_VER_CEA861     = 1,
@@ -48,14 +40,6 @@ enum cea_edid_versions {
        CEA_EDID_VER_RESERVED   = 4,
 };
 
-static char *cea_edid_version_names[8] = {
-       "no CEA EDID Timing Extension block present",
-       "CEA-861",
-       "CEA-861-A",
-       "CEA-861-B, C or D",
-       [4 ... 7] = "reserved"
-};
-
 static char *cea_speaker_allocation_names[] = {
        /*  0 */ "FL/FR",
        /*  1 */ "LFE",
@@ -478,6 +462,20 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
        struct hdmi_eld *e = entry->private_data;
        char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
        int i;
+       static char *eld_versoin_names[32] = {
+               "reserved",
+               "reserved",
+               "CEA-861D or below",
+               [3 ... 30] = "reserved",
+               [31] = "partial"
+       };
+       static char *cea_edid_version_names[8] = {
+               "no CEA EDID Timing Extension block present",
+               "CEA-861",
+               "CEA-861-A",
+               "CEA-861-B, C or D",
+               [4 ... 7] = "reserved"
+       };
 
        snd_iprintf(buffer, "monitor_name\t\t%s\n", e->monitor_name);
        snd_iprintf(buffer, "connection_type\t\t%s\n",