ACPI: fix ia64 allnoconfig build
authorLen Brown <len.brown@intel.com>
Fri, 24 Aug 2007 07:06:33 +0000 (03:06 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 24 Aug 2007 07:06:33 +0000 (03:06 -0400)
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@intel.com>
drivers/acpi/event.c

index cf6d5161cf3197d7ddfdf8e4f673fc5e4c063ba7..a2b9304596ce920596d29494421e9bf0163ca2f3 100644 (file)
@@ -233,8 +233,9 @@ static int acpi_event_genetlink_init(void)
 }
 
 #else
 }
 
 #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;
 }
 {
        return 0;
 }