diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:08 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:08 -0500 |
| commit | a29fb94ff48cba620e1ac1317f5eef5920ead3ff (patch) | |
| tree | 2fb8e026712bdf7848ea400e25118f6a58824a02 /sound/pci/hda/hda_codec.h | |
| parent | 52a7a5835173af61b9f6c3038212370d9717526f (diff) | |
| parent | dd3533eca859a6debb1565503ec03e68354e08e0 (diff) | |
Merge commit alsa/devel into topic/misc
Conflicts:
include/sound/version.h
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 1d541b7f5547..0d08ad5bd898 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
| @@ -789,6 +789,7 @@ struct hda_codec { | |||
| 789 | u32 *wcaps; | 789 | u32 *wcaps; |
| 790 | 790 | ||
| 791 | struct snd_array mixers; /* list of assigned mixer elements */ | 791 | struct snd_array mixers; /* list of assigned mixer elements */ |
| 792 | struct snd_array nids; /* list of mapped mixer elements */ | ||
| 792 | 793 | ||
| 793 | struct hda_cache_rec amp_cache; /* cache for amp access */ | 794 | struct hda_cache_rec amp_cache; /* cache for amp access */ |
| 794 | struct hda_cache_rec cmd_cache; /* cache for other commands */ | 795 | struct hda_cache_rec cmd_cache; /* cache for other commands */ |