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/char | |
| 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/char')
| -rw-r--r-- | drivers/char/sonypi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index aeec67e27264..859858561ab6 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -875,7 +875,7 @@ found: #ifdef CONFIG_ACPI if (sonypi_acpi_device) - acpi_bus_generate_event(sonypi_acpi_device, 1, event); + acpi_bus_generate_proc_event(sonypi_acpi_device, 1, event); #endif kfifo_put(sonypi_device.fifo, (unsigned char *)&event, sizeof(event)); |