diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-07 00:43:36 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 00:43:36 +0100 |
| commit | 6cb6524d90b6e5497e79a1474bdb2f26755d1c02 (patch) | |
| tree | fd475ac8f57a6bd39c976056324d1bc79d11b4c9 /drivers/acpi/dispatcher/dswscope.c | |
| parent | [PATCH] sem2mutex: drivers/macintosh/windfarm_core.c (diff) | |
| parent | [PATCH] USB: Fix GPL markings on usb core functions. (diff) | |
| download | linux-6cb6524d90b6e5497e79a1474bdb2f26755d1c02.tar.xz linux-6cb6524d90b6e5497e79a1474bdb2f26755d1c02.zip | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/acpi/dispatcher/dswscope.c')
| -rw-r--r-- | drivers/acpi/dispatcher/dswscope.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c index defe956ef751..ada21ef4a174 100644 --- a/drivers/acpi/dispatcher/dswscope.c +++ b/drivers/acpi/dispatcher/dswscope.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2005, R. Byron Moore + * Copyright (C) 2000 - 2006, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -107,14 +107,14 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node, if (!node) { /* Invalid scope */ - ACPI_REPORT_ERROR(("ds_scope_stack_push: null scope passed\n")); + ACPI_ERROR((AE_INFO, "Null scope parameter")); return_ACPI_STATUS(AE_BAD_PARAMETER); } /* Make sure object type is valid */ if (!acpi_ut_valid_object_type(type)) { - ACPI_REPORT_WARNING(("ds_scope_stack_push: Invalid object type: 0x%X\n", type)); + ACPI_WARNING((AE_INFO, "Invalid object type: 0x%X", type)); } /* Allocate a new scope object */ |