summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2009-11-11 13:49:07 +0100
committerTakashi Iwai <tiwai@suse.de>2009-11-16 14:14:28 +0100
commit85dd662ff4d2967084acfc761a33717383297e42 (patch)
treeaa274fbb508bc2ceeec81bb735ee297883234e92 /sound
parentALSA: hda - Add description of beep_mode in ALSA-Configuration.txt (diff)
downloadlinux-85dd662ff4d2967084acfc761a33717383297e42.tar.xz
linux-85dd662ff4d2967084acfc761a33717383297e42.zip
ALSA: hda - move snd_hda_pcm_type_name from hda_codec.h to hda_local.h
The snd_hda_pcm_type_name array is local only. Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_codec.h1
-rw-r--r--sound/pci/hda/hda_local.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 51920563bc7f..be6c5f443cd9 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/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/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 4e77f4747291..7c049839ea26 100644
--- a/sound/pci/hda/hda_local.h
+++ b/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,