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
This commit is contained in:
Linus Torvalds
2006-12-21 00:02:03 -08:00
6 changed files with 42 additions and 28 deletions
+2 -2
View File
@@ -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,
},
{