From 1a2f3e2f0dc10607ffe5262ba17bede290bfd7c1 Mon Sep 17 00:00:00 2001 From: "akpm@osdl.org" Date: Fri, 30 Jun 2006 03:15:00 -0400 Subject: [PATCH] --- yaml --- r: 31455 b: refs/heads/master c: 0a1f1ab8de815cb63a48d24450f6b5fbb1b1f89c h: refs/heads/master i: 31453: dff1c4cf732310bec294219b8a50496938cfe68f 31451: a688940af0ea221e12e9a9b382e72eb0331e9edf 31447: e5c7b8c66f1fee64c228a6db8da72e60fcb569af 31439: ae7de97037b98053adbd7cfbcb440895f9608ef6 31423: f55bb6d3426d1cc54bd06c4f25e4fc881e7d3472 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpi_memhotplug.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8457f8a58bf7..131206da3468 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d120cfb544ed6161b9d32fb6c4648c471807ee6b +refs/heads/master: 0a1f1ab8de815cb63a48d24450f6b5fbb1b1f89c diff --git a/trunk/drivers/acpi/acpi_memhotplug.c b/trunk/drivers/acpi/acpi_memhotplug.c index 6f5e395c78af..cd57372a6729 100644 --- a/trunk/drivers/acpi/acpi_memhotplug.c +++ b/trunk/drivers/acpi/acpi_memhotplug.c @@ -248,7 +248,7 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) num_enabled++; } if (!num_enabled) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "\nadd_memory failed\n")); + printk(KERN_ERR PREFIX "add_memory failed\n"); mem_device->state = MEMORY_INVALID_STATE; return -EINVAL; }