summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-14 23:22:45 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-14 23:22:45 +0200
commitf3ce717e60572421f56d89c9a85ac42e634d16e7 (patch)
tree46b85329773c7908378f90e4e8e86205ebfd229f /include/acpi
parentd4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff)
parente73d3136355f511d3e1c2ef21acf02b19bd2b650 (diff)
downloadlinux-f3ce717e60572421f56d89c9a85ac42e634d16e7.tar.gz
linux-f3ce717e60572421f56d89c9a85ac42e634d16e7.tar.bz2
linux-f3ce717e60572421f56d89c9a85ac42e634d16e7.zip
Merge back earlier 'acpi-assorted' material
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 94383a70c1a3..a87eeda25627 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -359,7 +359,6 @@ extern void unregister_acpi_bus_notifier(struct notifier_block *nb);
*/
int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device);
-void acpi_bus_data_handler(acpi_handle handle, void *context);
acpi_status acpi_bus_get_status_handle(acpi_handle handle,
unsigned long long *sta);
int acpi_bus_get_status(struct acpi_device *device);
@@ -379,15 +378,6 @@ bool acpi_bus_can_wakeup(acpi_handle handle);
static inline bool acpi_bus_can_wakeup(acpi_handle handle) { return false; }
#endif
-#ifdef CONFIG_ACPI_PROC_EVENT
-int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data);
-int acpi_bus_generate_proc_event4(const char *class, const char *bid, u8 type, int data);
-int acpi_bus_receive_event(struct acpi_bus_event *event);
-#else
-static inline int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)
- { return 0; }
-#endif
-
void acpi_scan_lock_acquire(void);
void acpi_scan_lock_release(void);
int acpi_scan_add_handler(struct acpi_scan_handler *handler);