diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
| commit | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch) | |
| tree | c9b941f4798a2accca200b0b01c07353ce5b07e1 /drivers/platform | |
| parent | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff) | |
| parent | e55a5999ffcf72dc4d43d73618957964cb87065a (diff) | |
| download | linux-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.tar.bz2 | |
Merge branch 'sfi-base' into release
Conflicts:
drivers/acpi/power.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/fujitsu-laptop.c | 4 | ||||
| -rw-r--r-- | drivers/platform/x86/wmi.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 218b9a16ac3f..eabddc9c192b 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -700,7 +700,7 @@ static int acpi_fujitsu_add(struct acpi_device *device) goto end; } - 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"); @@ -874,7 +874,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device) goto end; } - 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"); diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index f215a5919192..177f8d767df4 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -42,7 +42,6 @@ MODULE_LICENSE("GPL"); #define ACPI_WMI_CLASS "wmi" -#undef PREFIX #define PREFIX "ACPI: WMI: " static DEFINE_MUTEX(wmi_data_lock); |