ALSA: hda - Keep char arrays in input_mux items

[net-next-2.6.git] / sound / pci / hda / hda_local.h

diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index fb561748adb8bcd81e24809ad5b165093f713df7..b448b0a997b186f961df3bb843ae1d72c0cf83fc 100644 (file)
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -215,7 +215,7 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid);
  */
 #define HDA_MAX_NUM_INPUTS     16
 struct hda_input_mux_item {
-       const char *label;
+       char label[32];
        unsigned int index;
 };
 struct hda_input_mux {
@@ -391,8 +391,8 @@ struct auto_pin_cfg_item {
 };
 
 struct auto_pin_cfg;
-const char *snd_hda_get_input_pin_label(const struct auto_pin_cfg *cfg,
-                                       int input);
+void snd_hda_get_input_pin_label(const struct auto_pin_cfg *cfg,
+                                int input, char *label);
 
 struct auto_pin_cfg {
        int line_outs;