diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-07-19 11:42:09 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-07-19 11:42:09 -0400 |
commit | 8d011cc7a9374db9b5ace3b75d34f10fdc3b51c4 (patch) | |
tree | 6561bac3271ad8e46ed214bc92db362e1c56316a /sound/pci/hda/hda_codec.h | |
parent | e2768c0c223d86a20ec392528bafd25996ce7585 (diff) | |
parent | 9e216e8a40428cbf689222148c28d0256fbd0186 (diff) |
Merge branch 'devel' of git.alsa-project.org:alsa-kernel into topic/misc
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
-rw-r--r-- | sound/pci/hda/hda_codec.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 49e939e7e5cd..f96e909f549c 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
@@ -760,7 +760,10 @@ struct hda_codec { | |||
760 | hda_nid_t mfg; /* MFG node id */ | 760 | hda_nid_t mfg; /* MFG node id */ |
761 | 761 | ||
762 | /* ids */ | 762 | /* ids */ |
763 | u32 function_id; | 763 | u8 afg_function_id; |
764 | u8 mfg_function_id; | ||
765 | u8 afg_unsol; | ||
766 | u8 mfg_unsol; | ||
764 | u32 vendor_id; | 767 | u32 vendor_id; |
765 | u32 subsystem_id; | 768 | u32 subsystem_id; |
766 | u32 revision_id; | 769 | u32 revision_id; |