aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/event.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-17 01:24:49 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-17 01:24:49 -0400
commitc2f828977ba5d17c13debba374ea252d18e5ccfb (patch)
tree49d95c5e9325f93f379e5c249bf5a39f8e8040ae /drivers/acpi/event.c
parent6553daeafb4fa15cd07088f543352fa3779e86e1 (diff)
parentecfe7f093768f7af0959f5be8ec039dcc29724af (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: thinkpad-acpi: bump up version to 0.16 ACPI: thinkpad-acpi: revert new 2.6.23 CONFIG_THINKPAD_ACPI_INPUT_ENABLED option ACPI: fix CONFIG_NET=n acpi_bus_generate_netlink_event build failure msi-laptop: replace ',' with ';' ACPI: (more) delete CONFIG_ACPI_PROCFS_SLEEP (again)
Diffstat (limited to 'drivers/acpi/event.c')
-rw-r--r--drivers/acpi/event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index a2b9304596ce..5c95863f8fa9 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -240,7 +240,7 @@ int acpi_bus_generate_netlink_event(const char *device_class,
240 return 0; 240 return 0;
241} 241}
242 242
243EXPORT_SYMBOL(acpi_generate_netlink_event); 243EXPORT_SYMBOL(acpi_bus_generate_netlink_event);
244 244
245static int acpi_event_genetlink_init(void) 245static int acpi_event_genetlink_init(void)
246{ 246{