diff options
| author | Len Brown <len.brown@intel.com> | 2007-08-25 01:44:01 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-08-25 01:44:01 -0400 |
| commit | 25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9 (patch) | |
| tree | c42d40004e9668d83ab03ab7332515ef08683c54 /drivers/char | |
| parent | a4fd4946214fae86610b989c47e5ae762cc96ddb (diff) | |
| parent | 3e069ee0c30d6f28b79e409ef2df1ffa427897ae (diff) | |
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: | |||
| 875 | 875 | ||
| 876 | #ifdef CONFIG_ACPI | 876 | #ifdef CONFIG_ACPI |
| 877 | if (sonypi_acpi_device) | 877 | if (sonypi_acpi_device) |
| 878 | acpi_bus_generate_event(sonypi_acpi_device, 1, event); | 878 | acpi_bus_generate_proc_event(sonypi_acpi_device, 1, event); |
| 879 | #endif | 879 | #endif |
| 880 | 880 | ||
| 881 | kfifo_put(sonypi_device.fifo, (unsigned char *)&event, sizeof(event)); | 881 | kfifo_put(sonypi_device.fifo, (unsigned char *)&event, sizeof(event)); |