Merge branch 'fujitsu' into release

[linux-2.6.git] / drivers / platform / x86 / fujitsu-laptop.c

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 1ed3513a62a2e07d299632375624b89c338a1aa9..f35aee5c21491ebc763bdff1e5a41a6fdba147dd 100644 (file)
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -694,7 +694,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
                goto err_unregister_input_dev;
        }
 
                goto err_unregister_input_dev;
        }
 

-       printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
+       printk(KERN_INFO "ACPI: %s [%s] (%s)\n",

               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");
 
               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");
 


@@ -865,7 +865,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
                goto err_unregister_input_dev;
        }
 
                goto err_unregister_input_dev;
        }
 

-       printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
+       printk(KERN_INFO "ACPI: %s [%s] (%s)\n",

               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");
 
               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");