diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-21 00:02:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-21 00:02:03 -0800 |
| commit | 28cb5ccd306e6cffd4498ba350bc7c82f5fbee44 (patch) | |
| tree | dc64b074f3fcd51430f5161d6074fc3a6e85dc09 /drivers | |
| parent | de9b2fccb6a1efdf1665ebbcb28cad61467b308a (diff) | |
| parent | 1f21782e63da81f56401a813a52091ef2703838f (diff) | |
| download | op-kernel-dev-28cb5ccd306e6cffd4498ba350bc7c82f5fbee44.zip op-kernel-dev-28cb5ccd306e6cffd4498ba350bc7c82f5fbee44.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
Driver core: proper prototype for drivers/base/init.c:driver_init()
kobject: kobject_uevent() returns manageable value
kref refcnt and false positives
Diffstat (limited to 'drivers')
| -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 003a987..5a84459 100644 --- a/drivers/acpi/ibm_acpi.c +++ b/drivers/acpi/ibm_acpi.c @@ -352,7 +352,7 @@ static char *next_cmd(char **cmds) return start; } -static int driver_init(void) +static int ibm_acpi_driver_init(void) { printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION); printk(IBM_INFO "%s\n", IBM_URL); @@ -1605,7 +1605,7 @@ static int fan_write(char *buf) static struct ibm_struct ibms[] = { { .name = "driver", - .init = driver_init, + .init = ibm_acpi_driver_init, .read = driver_read, }, { |
