From: Len Brown Date: Fri, 24 Aug 2007 07:06:33 +0000 (-0400) Subject: ACPI: fix ia64 allnoconfig build X-Git-Tag: v3.12-rc1~27055^2~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e069ee0c30d6f28b79e409ef2df1ffa427897ae;p=kernel%2Fkernel-generic.git ACPI: fix ia64 allnoconfig build 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 --- 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; }