diff options
| author | Rafael J. Wysocki | 2013-08-14 23:22:45 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2013-08-14 23:22:45 +0200 |
| commit | f3ce717e60572421f56d89c9a85ac42e634d16e7 (patch) | |
| tree | 46b85329773c7908378f90e4e8e86205ebfd229f /drivers/char | |
| parent | Linux 3.11-rc5 (diff) | |
| parent | ACPI / osl: Fix osi_setup_entries[] __initdata attribute location (diff) | |
| download | kernel-qcow2-linux-f3ce717e60572421f56d89c9a85ac42e634d16e7.tar.gz kernel-qcow2-linux-f3ce717e60572421f56d89c9a85ac42e634d16e7.tar.xz kernel-qcow2-linux-f3ce717e60572421f56d89c9a85ac42e634d16e7.zip | |
Merge back earlier 'acpi-assorted' material
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/sonypi.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index bf2349dbbf7f..7cc1fe2241fd 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -876,11 +876,6 @@ found: if (useinput) sonypi_report_input_event(event); -#ifdef CONFIG_ACPI - if (sonypi_acpi_device) - acpi_bus_generate_proc_event(sonypi_acpi_device, 1, event); -#endif - kfifo_in_locked(&sonypi_device.fifo, (unsigned char *)&event, sizeof(event), &sonypi_device.fifo_lock); kill_fasync(&sonypi_device.fifo_async, SIGIO, POLL_IN); |