Merge branch 'misc-2.6.32' into release

[linux-2.6-block.git] / drivers / acpi / bus.c

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 0fb6b2a8b10366633ec3919d4f4897a47d04852c..135fbfe1825c94a5052fef82c0970e6e1f20fdcc 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -142,7 +142,7 @@ int acpi_bus_get_status(struct acpi_device *device)
 EXPORT_SYMBOL(acpi_bus_get_status);
 
 void acpi_bus_private_data_handler(acpi_handle handle,
-                                  u32 function, void *context)
+                                  void *context)
 {
        return;
 }