diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
| commit | 33052057e3e2db7f37fc78aa3f25c98f7e989fae (patch) | |
| tree | e80a3aa1371f513c833dc94a16674f78faeeeb1d /drivers/acpi/parser/psopcode.c | |
| parent | 00b464debf0038b1628996065f0be564ccfbfd86 (diff) | |
| parent | 1113a7e92e483074c6235da59460759e33b9b144 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/parser/psopcode.c')
| -rw-r--r-- | drivers/acpi/parser/psopcode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c index 229ae86afe8b..11d6351ab8b2 100644 --- a/drivers/acpi/parser/psopcode.c +++ b/drivers/acpi/parser/psopcode.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (C) 2000 - 2005, R. Byron Moore | 8 | * Copyright (C) 2000 - 2006, R. Byron Moore |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * | 10 | * |
| 11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
| @@ -747,7 +747,7 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode) | |||
| 747 | 747 | ||
| 748 | /* Unknown AML opcode */ | 748 | /* Unknown AML opcode */ |
| 749 | 749 | ||
| 750 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 750 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, |
| 751 | "Unknown AML opcode [%4.4X]\n", opcode)); | 751 | "Unknown AML opcode [%4.4X]\n", opcode)); |
| 752 | 752 | ||
| 753 | return (&acpi_gbl_aml_op_info[_UNK]); | 753 | return (&acpi_gbl_aml_op_info[_UNK]); |