From 561b4c2253854395b8fbedc62ac6e4b5b89d1588 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 11 Nov 2009 13:49:07 +0100 Subject: [PATCH] --- yaml --- r: 170335 b: refs/heads/master c: 85dd662ff4d2967084acfc761a33717383297e42 h: refs/heads/master i: 170333: 68dfed639674b4abfeeca64bedfcf17f4474b4ea 170331: 15a9e117f8b4e99e359bdea3a5acd062d6f07d3e 170327: b54719a38d72db8935c25e18e4b5ac9a27be5156 170319: c4f45d846d620fdcccc597f2a00e0b48a5af45af 170303: c560fecdc48466ddbe5b629da51b16fec825627d v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.h | 1 - trunk/sound/pci/hda/hda_local.h | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4243f98e7cb0..f0468f49b862 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d019361a0802924e2dbcd7313fa3dcfc960222a7 +refs/heads/master: 85dd662ff4d2967084acfc761a33717383297e42 diff --git a/trunk/sound/pci/hda/hda_codec.h b/trunk/sound/pci/hda/hda_codec.h index 51920563bc7f..be6c5f443cd9 100644 --- a/trunk/sound/pci/hda/hda_codec.h +++ b/trunk/sound/pci/hda/hda_codec.h @@ -898,7 +898,6 @@ int snd_hda_codec_build_controls(struct hda_codec *codec); /* * PCM */ -extern const char *snd_hda_pcm_type_name[]; int snd_hda_build_pcms(struct hda_bus *bus); int snd_hda_codec_build_pcms(struct hda_codec *codec); void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, diff --git a/trunk/sound/pci/hda/hda_local.h b/trunk/sound/pci/hda/hda_local.h index 4e77f4747291..7c049839ea26 100644 --- a/trunk/sound/pci/hda/hda_local.h +++ b/trunk/sound/pci/hda/hda_local.h @@ -92,6 +92,8 @@ #define HDA_CODEC_MUTE_BEEP(xname, nid, xindex, direction) \ HDA_CODEC_MUTE_BEEP_MONO(xname, nid, 3, xindex, direction) +extern const char *snd_hda_pcm_type_name[]; + int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,