diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
| commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (patch) | |
| tree | b356490269c9e77d164dcc1477792b882fbb8bdb /sound/pci/hda/hda_codec.h | |
| parent | ba1511bf7fbda452138e4096bf10d5a382710f4f (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
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 */ |