diff --git a/[refs] b/[refs] index c519ebffa4f2..dabb3cdd88b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14e04fb34ffa82ee61ae69f98d8fca12d2e8e31c +refs/heads/master: 3e069ee0c30d6f28b79e409ef2df1ffa427897ae diff --git a/trunk/drivers/acpi/event.c b/trunk/drivers/acpi/event.c index cf6d5161cf31..a2b9304596ce 100644 --- a/trunk/drivers/acpi/event.c +++ b/trunk/drivers/acpi/event.c @@ -233,8 +233,9 @@ static int acpi_event_genetlink_init(void) } #else -int acpi_bus_generate_netlink_event(struct acpi_device *device, u8 type, - int data) +int acpi_bus_generate_netlink_event(const char *device_class, + const char *bus_id, + u8 type, int data) { return 0; }