diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 21:37:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 21:37:07 +0100 |
| commit | 5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231 (patch) | |
| tree | 29dd80a7b33426d0890aa07b5864224557c62af7 /sound/pci/hda/hda_beep.h | |
| parent | tracing: kernel/trace/trace.c: introduce missing kfree() (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231.tar.xz linux-5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231.zip | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'sound/pci/hda/hda_beep.h')
| -rw-r--r-- | sound/pci/hda/hda_beep.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h index de4036e6e710..b9679f081cae 100644 --- a/sound/pci/hda/hda_beep.h +++ b/sound/pci/hda/hda_beep.h @@ -31,6 +31,7 @@ struct hda_beep { char phys[32]; int tone; int nid; + int enabled; struct work_struct beep_work; /* scheduled task for beep event */ }; |