drivers/acpi/event.c:238: error: conflicting types for â??acpi_bus_generate_netlink_eventâ?? include/acpi/acpi_bus.h:324: error: previous declaration of â??acpi_bus_generate_netlink_eventâ?? was here Signed-off-by: Len Brown <len.brown@xxxxxxxxx> --- drivers/acpi/event.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c index cf6d516..a2b9304 100644 --- a/drivers/acpi/event.c +++ b/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; } -- 1.5.3.rc6.17.g1911 - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html