diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /drivers/acpi/bus.c | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index ce3c0a2cbac4..5b6760e0f957 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
| @@ -776,7 +776,7 @@ static int __init acpi_init(void) | |||
| 776 | 776 | ||
| 777 | acpi_kobj = kobject_create_and_add("acpi", firmware_kobj); | 777 | acpi_kobj = kobject_create_and_add("acpi", firmware_kobj); |
| 778 | if (!acpi_kobj) { | 778 | if (!acpi_kobj) { |
| 779 | printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__); | 779 | printk(KERN_WARNING "%s: kset create error\n", __func__); |
| 780 | acpi_kobj = NULL; | 780 | acpi_kobj = NULL; |
| 781 | } | 781 | } |
| 782 | 782 | ||