projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
acpi
/
acpica
/
exconcat.c
diff --git
a/drivers/acpi/acpica/exconcat.c
b/drivers/acpi/acpica/exconcat.c
index
2423fe0
..
5429c2a
100644
(file)
--- a/
drivers/acpi/acpica/exconcat.c
+++ b/
drivers/acpi/acpica/exconcat.c
@@
-156,7
+156,7
@@
acpi_ex_do_concatenate(union acpi_operand_object *operand0,
status =
acpi_ex_convert_to_integer(local_operand1, &temp_operand1,
- 16);
+
ACPI_STRTOUL_BASE
16);
break;
case ACPI_TYPE_BUFFER: