diff options
| author |   Lv Zheng <lv.zheng@intel.com> | 2015-12-29 13:52:32 +0800 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-01 03:26:44 +0100 |
| commit | 5431b6543fb45f6c61dbb1394c918f3bc5acefae (patch) | |
| tree | f650faee3089b7860f203f96ea3cc61b1a19c49d /drivers/acpi/acpica/exconvrt.c | |
| parent | Merge branch 'acpi-debug' into acpica (diff) | |
| download | linux-dev-5431b6543fb45f6c61dbb1394c918f3bc5acefae.tar.xz linux-dev-5431b6543fb45f6c61dbb1394c918f3bc5acefae.zip | |
ACPICA: Linuxize: reduce divergences for 20151218 release
The patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20151218 release can be
applied with reduced human intervention.
The pscode.c has already been out of sync for months, and it becomes more
and more difficult to merge pscode.c changes, so instead of update the
affected lines of pscode.c, this patch synchronizes entire pscode.c file.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/exconvrt.c')
| -rw-r--r-- | drivers/acpi/acpica/exconvrt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c index 1e4c5b6dc0b0..145de28c702d 100644 --- a/drivers/acpi/acpica/exconvrt.c +++ b/drivers/acpi/acpica/exconvrt.c @@ -355,8 +355,8 @@ acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 data_width) /* Get one hex digit, most significant digits first */ string[k] = - (u8) acpi_ut_hex_to_ascii_char(integer, - ACPI_MUL_4(j)); + (u8)acpi_ut_hex_to_ascii_char(integer, + ACPI_MUL_4(j)); k++; } break; |