X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=sound%2Fpci%2Fhda%2Fhda_local.h;h=b448b0a997b186f961df3bb843ae1d72c0cf83fc;hb=b5786e85cb2ffd0b07e86dec38a442bd20765ad8;hp=fb561748adb8bcd81e24809ad5b165093f713df7;hpb=6cb3b707f95954ac18f19b4b3919af235738371a;p=net-next-2.6.git

diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index fb561748adb..b448b0a997b 100644
--- 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;