Merge branch 'topic/asoc' into for-linus

[pandora-kernel.git] / sound / pci / hda / hda_beep.h

diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index 51bf6a5..0c3de78 100644 (file)
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -30,8 +30,9 @@ struct hda_beep {
        struct hda_codec *codec;
        char phys[32];
        int tone;
-       int nid;
-       int enabled;
+       hda_nid_t nid;
+       unsigned int enabled:1;
+       unsigned int linear_tone:1;     /* linear tone for IDT/STAC codec */
        struct work_struct beep_work; /* scheduled task for beep event */
 };