summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-15 21:28:57 -0400
committerLen Brown <len.brown@intel.com>2006-06-15 21:28:57 -0400
commit69cd291c6bbc6647fe3783257c5a2e076e808f71 (patch)
tree6f65a2d7d29228129cef09343c485aad64e3a3f1 /include/acpi
parent35a5d9ed9fedb74c22cb19ff7d749289473144e0 (diff)
parent06ea8e08ae7e7e450b6a78e7ce5e10b3c5f954ea (diff)
downloadop-kernel-dev-69cd291c6bbc6647fe3783257c5a2e076e808f71.zip
op-kernel-dev-69cd291c6bbc6647fe3783257c5a2e076e808f71.tar.gz
Pull acpi_bus_register_driver into release branch
Conflicts: drivers/acpi/asus_acpi.c drivers/acpi/scan.c
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 43f8c2a..8c7590f 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -327,7 +327,7 @@ int acpi_bus_set_power(acpi_handle handle, int state);
int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data);
int acpi_bus_receive_event(struct acpi_bus_event *event);
int acpi_bus_register_driver(struct acpi_driver *driver);
-int acpi_bus_unregister_driver(struct acpi_driver *driver);
+void acpi_bus_unregister_driver(struct acpi_driver *driver);
int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,
acpi_handle handle, int type);
int acpi_bus_trim(struct acpi_device *start, int rmdevice);
OpenPOWER on IntegriCloud