diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-06 08:25:04 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-06 08:25:04 -0500 |
| commit | b2573eb586169dfb02772856a4e7cb760f21ec12 (patch) | |
| tree | d15ffe58c5290e33c7204e80cb0da9ea5262c1a8 /sound/pci/hda/hda_codec.h | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
| parent | 4a5a4c56b443a213fa9c2ad27984a8681a3d7087 (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 | 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 5810ef588402..09a332ada0c6 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
| @@ -614,6 +614,7 @@ struct hda_bus { | |||
| 614 | 614 | ||
| 615 | /* unsolicited event queue */ | 615 | /* unsolicited event queue */ |
| 616 | struct hda_bus_unsolicited *unsol; | 616 | struct hda_bus_unsolicited *unsol; |
| 617 | char workq_name[16]; | ||
| 617 | struct workqueue_struct *workq; /* common workqueue for codecs */ | 618 | struct workqueue_struct *workq; /* common workqueue for codecs */ |
| 618 | 619 | ||
| 619 | /* assigned PCMs */ | 620 | /* assigned PCMs */ |