diff options
| author | Len Brown <len.brown@intel.com> | 2007-08-25 07:44:01 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-08-25 07:44:01 +0200 |
| commit | 25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9 (patch) | |
| tree | c42d40004e9668d83ab03ab7332515ef08683c54 /drivers/misc/asus-laptop.c | |
| parent | Pull misc into release branch (diff) | |
| parent | ACPI: fix ia64 allnoconfig build (diff) | |
| download | linux-25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9.tar.xz linux-25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9.zip | |
Pull events into release branch
Conflicts:
drivers/acpi/video.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc/asus-laptop.c')
| -rw-r--r-- | drivers/misc/asus-laptop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index 40db9f70148f..7dce318df1bd 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c @@ -732,7 +732,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) lcd_blank(FB_BLANK_POWERDOWN); } - acpi_bus_generate_event(hotk->device, event, + acpi_bus_generate_proc_event(hotk->device, event, hotk->event_count[event % 128]++); return; |