diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:51 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:51 -0400 |
| commit | bcb631f31839cb7c7dd56ab534b6eb4867e9161b (patch) | |
| tree | d86336c9cfb22e4af69fbe73c94299a775ecc220 /drivers/acpi/acpi_memhotplug.c | |
| parent | 955ba395616a78780e70dc3f3b0b56ca4db52e5c (diff) | |
| parent | ed37a71eac8ba375d85ab10ed5f5e8bdf1cd72e0 (diff) | |
| download | op-kernel-dev-bcb631f31839cb7c7dd56ab534b6eb4867e9161b.zip op-kernel-dev-bcb631f31839cb7c7dd56ab534b6eb4867e9161b.tar.gz | |
Merge branch 'acpica' into test
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
| -rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 5f1127a..bbad9b6 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -454,8 +454,8 @@ static int acpi_memory_device_start (struct acpi_device *device) /* call add_memory func */ result = acpi_memory_enable_device(mem_device); if (result) - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "Error in acpi_memory_enable_device\n")); + printk(KERN_ERR PREFIX + "Error in acpi_memory_enable_device\n"); } return result; } |
