diff options
Diffstat (limited to 'drivers/acpi/ibm_acpi.c')
-rw-r--r-- | drivers/acpi/ibm_acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c index 0e7682a88aa8..b72d13d11a27 100644 --- a/drivers/acpi/ibm_acpi.c +++ b/drivers/acpi/ibm_acpi.c | |||
@@ -493,7 +493,7 @@ static char *next_cmd(char **cmds) | |||
493 | return start; | 493 | return start; |
494 | } | 494 | } |
495 | 495 | ||
496 | static int driver_init(void) | 496 | static int ibm_acpi_driver_init(void) |
497 | { | 497 | { |
498 | printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION); | 498 | printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION); |
499 | printk(IBM_INFO "%s\n", IBM_URL); | 499 | printk(IBM_INFO "%s\n", IBM_URL); |
@@ -2297,7 +2297,7 @@ static void fan_watchdog_fire(struct work_struct *ignored) | |||
2297 | static struct ibm_struct ibms[] = { | 2297 | static struct ibm_struct ibms[] = { |
2298 | { | 2298 | { |
2299 | .name = "driver", | 2299 | .name = "driver", |
2300 | .init = driver_init, | 2300 | .init = ibm_acpi_driver_init, |
2301 | .read = driver_read, | 2301 | .read = driver_read, |
2302 | }, | 2302 | }, |
2303 | { | 2303 | { |