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/x86/fujitsu-laptop.c | |
| parent | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff) | |
| parent | e55a5999ffcf72dc4d43d73618957964cb87065a (diff) | |
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/x86/fujitsu-laptop.c')
| -rw-r--r-- | drivers/platform/x86/fujitsu-laptop.c | 4 |
1 files changed, 2 insertions, 2 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) | |||
| 700 | goto end; | 700 | goto end; |
| 701 | } | 701 | } |
| 702 | 702 | ||
| 703 | printk(KERN_INFO PREFIX "%s [%s] (%s)\n", | 703 | printk(KERN_INFO "ACPI: %s [%s] (%s)\n", |
| 704 | acpi_device_name(device), acpi_device_bid(device), | 704 | acpi_device_name(device), acpi_device_bid(device), |
| 705 | !device->power.state ? "on" : "off"); | 705 | !device->power.state ? "on" : "off"); |
| 706 | 706 | ||
| @@ -874,7 +874,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device) | |||
| 874 | goto end; | 874 | goto end; |
| 875 | } | 875 | } |
| 876 | 876 | ||
| 877 | printk(KERN_INFO PREFIX "%s [%s] (%s)\n", | 877 | printk(KERN_INFO "ACPI: %s [%s] (%s)\n", |
| 878 | acpi_device_name(device), acpi_device_bid(device), | 878 | acpi_device_name(device), acpi_device_bid(device), |
| 879 | !device->power.state ? "on" : "off"); | 879 | !device->power.state ? "on" : "off"); |
| 880 | 880 | ||