diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-23 08:47:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-23 08:47:06 +0200 |
| commit | d2f927d42a87b712946dee72a0b96b6b6c6aff1d (patch) | |
| tree | 879a34767b24e65569d24cb19490a4bdcb1beace /sound/pci/hda/hda_codec.h | |
| parent | 9c77b846ec8b4e0c7107dd7f820172462dc84a61 (diff) | |
| parent | 6f0ef6ea1d11ef242de584e345355b0de756fcb2 (diff) | |
Merge branch 'fix/hda' 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, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 4303353feda9..62c702240108 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -648,6 +648,7 @@ struct hda_bus { struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; struct mutex cmd_mutex; + struct mutex prepare_mutex; /* unsolicited event queue */ struct hda_bus_unsolicited *unsol; @@ -826,7 +827,6 @@ struct hda_codec { struct mutex spdif_mutex; struct mutex control_mutex; - struct mutex prepare_mutex; unsigned int spdif_status; /* IEC958 status bits */ unsigned short spdif_ctls; /* SPDIF control bits */ unsigned int spdif_in_enable; /* SPDIF input enable? */ |