diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 01:06:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 01:06:15 -0500 |
| commit | 59ed2f59e4ea6a32f9591e378da7935f713a7000 (patch) | |
| tree | a1276a611dbb1bc44685ef8af363e99603e60047 /drivers/acpi/parser/psopcode.c | |
| parent | 9ad11ab48b1ad618bf47076e9e579f267f5306c2 (diff) | |
| parent | b8e4d89357fc434618a59c1047cac72641191805 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-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]); |