diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:49 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:49 +0100 |
| commit | 12c2a682b55a40f2a986e36d6632110029bc63a5 (patch) | |
| tree | ba21f049e4859411f6c135d597dc26260963ce7c /sound/pci/hda/hda_codec.h | |
| parent | a86ba28583987b85845ed61be5f12aafb5fc4971 (diff) | |
| parent | aefbd3e823d4fe219bb6420b0cac505847270507 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 0a770a28e71..0c8f05cc56b 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -789,6 +789,7 @@ struct hda_codec { u32 *wcaps; struct snd_array mixers; /* list of assigned mixer elements */ + struct snd_array nids; /* list of mapped mixer elements */ struct hda_cache_rec amp_cache; /* cache for amp access */ struct hda_cache_rec cmd_cache; /* cache for other commands */ @@ -898,6 +899,7 @@ int snd_hda_codec_set_pincfg(struct hda_codec *codec, hda_nid_t nid, unsigned int cfg); int snd_hda_add_pincfg(struct hda_codec *codec, struct snd_array *list, hda_nid_t nid, unsigned int cfg); /* for hwdep */ +void snd_hda_shutup_pins(struct hda_codec *codec); /* * Mixer |