diff options
| author | Len Brown <len.brown@intel.com> | 2007-10-10 00:30:19 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-10-10 00:30:19 -0400 |
| commit | e270051d9c6e5f0b31668ec1f0d864ab9920ffca (patch) | |
| tree | 49c2a5fb6ca6790f9cf070b49552388dadc7fa5b /include | |
| parent | a2883dfa2e4a94b24109b2bfe735561e50cc44b4 (diff) | |
| parent | d5b4a3d0efa36de31b86d5677dad6c36cb8735d7 (diff) | |
Pull battery-sbs-ac into release branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 86aea44ce6d4..8a388e766162 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -333,6 +333,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state); | |||
| 333 | int acpi_bus_set_power(acpi_handle handle, int state); | 333 | int acpi_bus_set_power(acpi_handle handle, int state); |
| 334 | #ifdef CONFIG_ACPI_PROC_EVENT | 334 | #ifdef CONFIG_ACPI_PROC_EVENT |
| 335 | int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data); | 335 | int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data); |
| 336 | int acpi_bus_generate_proc_event4(const char *class, const char *bid, u8 type, int data); | ||
| 336 | int acpi_bus_receive_event(struct acpi_bus_event *event); | 337 | int acpi_bus_receive_event(struct acpi_bus_event *event); |
| 337 | #else | 338 | #else |
| 338 | static inline int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data) | 339 | static inline int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data) |