diff options
| author | Len Brown <len.brown@intel.com> | 2009-07-28 16:45:54 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-08-28 19:57:27 -0400 |
| commit | a192a9580bcc41692be1f36b77c3b681827f566a (patch) | |
| tree | 8cf1637f87faa880fdffab62a701b47f699945f9 /drivers/platform | |
| parent | 2a4ab640d3c28c2952967e5f63ea495555bf2a5f (diff) | |
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
Linux/ACPI core files using internal.h all PREFIX "ACPI: ",
however, not all ACPI drivers use/want it -- and they
should not have to #undef PREFIX to define their own.
Add GPL commment to internal.h while we are there.
This does not change any actual console output,
asside from a whitespace fix.
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) | |||
| 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 | ||
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"); | |||
| 42 | 42 | ||
| 43 | #define ACPI_WMI_CLASS "wmi" | 43 | #define ACPI_WMI_CLASS "wmi" |
| 44 | 44 | ||
| 45 | #undef PREFIX | ||
| 46 | #define PREFIX "ACPI: WMI: " | 45 | #define PREFIX "ACPI: WMI: " |
| 47 | 46 | ||
| 48 | static DEFINE_MUTEX(wmi_data_lock); | 47 | static DEFINE_MUTEX(wmi_data_lock); |
