WorkStruct: make allyesconfig

[deliverable/linux.git] / sound / pci / hda / hda_local.h

diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 0f0ae685a9c171cb2ac97e0e851e34e5ebd9800d..9ca1baf860bd579ffd64321d2efe5d7ecce8e599 100644 (file)
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -36,7 +36,7 @@
          .info = snd_hda_mixer_amp_volume_info, \
          .get = snd_hda_mixer_amp_volume_get, \
          .put = snd_hda_mixer_amp_volume_put, \
-         .tlv.c = snd_hda_mixer_amp_tlv, \
+         .tlv = { .c = snd_hda_mixer_amp_tlv },                \
          .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }
 /* stereo volume with index */
 #define HDA_CODEC_VOLUME_IDX(xname, xcidx, nid, xindex, direction) \
@@ -206,6 +206,7 @@ struct hda_bus_unsolicited {
        /* workqueue */
        struct workqueue_struct *workq;
        struct work_struct work;
+       struct hda_bus *bus;
 };
 
 /*
@@ -229,7 +230,8 @@ struct auto_pin_cfg {
        hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */
        int speaker_outs;
        hda_nid_t speaker_pins[5];
-       hda_nid_t hp_pin;
+       int hp_outs;
+       hda_nid_t hp_pins[5];
        hda_nid_t input_pins[AUTO_PIN_LAST];
        hda_nid_t dig_out_pin;
        hda_nid_t dig_in_pin;