diff options
author | Len Brown <len.brown@intel.com> | 2007-08-24 03:06:33 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-08-24 03:06:33 -0400 |
commit | 3e069ee0c30d6f28b79e409ef2df1ffa427897ae (patch) | |
tree | 2da13043b1c09107c03dd430b3c0a6e83b9162d0 /drivers/acpi | |
parent | 14e04fb34ffa82ee61ae69f98d8fca12d2e8e31c (diff) |
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 <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | 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 cf6d5161cf31..a2b9304596ce 100644 --- a/drivers/acpi/event.c +++ b/drivers/acpi/event.c | |||
@@ -233,8 +233,9 @@ static int acpi_event_genetlink_init(void) | |||
233 | } | 233 | } |
234 | 234 | ||
235 | #else | 235 | #else |
236 | int acpi_bus_generate_netlink_event(struct acpi_device *device, u8 type, | 236 | int acpi_bus_generate_netlink_event(const char *device_class, |
237 | int data) | 237 | const char *bus_id, |
238 | u8 type, int data) | ||
238 | { | 239 | { |
239 | return 0; | 240 | return 0; |
240 | } | 241 | } |