diff options
author | Len Brown <len.brown@intel.com> | 2007-08-23 15:20:26 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-08-23 15:20:26 -0400 |
commit | 14e04fb34ffa82ee61ae69f98d8fca12d2e8e31c (patch) | |
tree | 51ff919052cf456a23fa67e8d64d18f376b90582 /drivers/misc/sony-laptop.c | |
parent | 962ce8ca0604af0c3c5609f7613d4ec5fcfac623 (diff) |
ACPI: Schedule /proc/acpi/event for removal
Schedule /proc/acpi/event for removal in 6 months.
Re-name acpi_bus_generate_event() to acpi_bus_generate_proc_event()
to make sure there is no confusion that it is for /proc/acpi/event only.
Add CONFIG_ACPI_PROC_EVENT to allow removal of /proc/acpi/event.
There is no functional change if CONFIG_ACPI_PROC_EVENT=y
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc/sony-laptop.c')
-rw-r--r-- | drivers/misc/sony-laptop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 91da6880ae93..743bd49ae6f5 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
@@ -904,7 +904,7 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data) | |||
904 | 904 | ||
905 | dprintk("sony_acpi_notify, event: 0x%.2x\n", ev); | 905 | dprintk("sony_acpi_notify, event: 0x%.2x\n", ev); |
906 | sony_laptop_report_input_event(ev); | 906 | sony_laptop_report_input_event(ev); |
907 | acpi_bus_generate_event(sony_nc_acpi_device, 1, ev); | 907 | acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev); |
908 | } | 908 | } |
909 | 909 | ||
910 | static acpi_status sony_walk_callback(acpi_handle handle, u32 level, | 910 | static acpi_status sony_walk_callback(acpi_handle handle, u32 level, |
@@ -2292,7 +2292,7 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id) | |||
2292 | 2292 | ||
2293 | found: | 2293 | found: |
2294 | sony_laptop_report_input_event(device_event); | 2294 | sony_laptop_report_input_event(device_event); |
2295 | acpi_bus_generate_event(spic_dev.acpi_dev, 1, device_event); | 2295 | acpi_bus_generate_proc_event(spic_dev.acpi_dev, 1, device_event); |
2296 | sonypi_compat_report_event(device_event); | 2296 | sonypi_compat_report_event(device_event); |
2297 | 2297 | ||
2298 | return IRQ_HANDLED; | 2298 | return IRQ_HANDLED; |