diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-08-05 16:50:12 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-08-05 16:50:12 -0400 |
commit | 8b80c0f187d8711fede71b7bd6fb80cb76bb8be9 (patch) | |
tree | 1f7582124a4dc42eded38668f393db16ddd7d658 /drivers/acpi/acpica/exdump.c | |
parent | 49c68fd448568e79598b159efc09a7864bc59ede (diff) | |
parent | 796ca778585d833023c18e1815b2e30a2d2f00fd (diff) |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20140724.
ACPICA: ACPI 5.1: Update for PCCT table changes.
ACPICA/ARM: ACPI 5.1: Update for GTDT table changes.
ACPICA/ARM: ACPI 5.1: Update for MADT changes.
ACPICA/ARM: ACPI 5.1: Update for FADT changes.
ACPICA: ACPI 5.1: Support for the _CCA predifined name.
ACPICA: ACPI 5.1: New notify value for System Affinity Update.
ACPICA: ACPI 5.1: Support for the _DSD predefined name.
ACPICA: Debug object: Add current value of Timer() to debug line prefix.
ACPICA: acpihelp: Add UUID support, restructure some existing files.
ACPICA: Utilities: Fix local printf issue.
ACPICA: Tables: Update for DMAR table changes.
ACPICA: Remove some extraneous printf arguments.
ACPICA: Update for comments/formatting. No functional changes.
ACPICA: Disassembler: Add support for the ToUUID opererator (macro).
ACPICA: Remove a redundant cast to acpi_size for ACPI_OFFSET() macro.
ACPICA: Work around an ancient GCC bug.
Diffstat (limited to 'drivers/acpi/acpica/exdump.c')
-rw-r--r-- | drivers/acpi/acpica/exdump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c index 925202acc3e4..0f23c3f2678e 100644 --- a/drivers/acpi/acpica/exdump.c +++ b/drivers/acpi/acpica/exdump.c | |||
@@ -494,7 +494,7 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc, | |||
494 | } | 494 | } |
495 | } | 495 | } |
496 | 496 | ||
497 | acpi_os_printf("\n", next); | 497 | acpi_os_printf("\n"); |
498 | break; | 498 | break; |
499 | 499 | ||
500 | case ACPI_EXD_HDLR_LIST: | 500 | case ACPI_EXD_HDLR_LIST: |
@@ -528,7 +528,7 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc, | |||
528 | } | 528 | } |
529 | } | 529 | } |
530 | 530 | ||
531 | acpi_os_printf("\n", next); | 531 | acpi_os_printf("\n"); |
532 | break; | 532 | break; |
533 | 533 | ||
534 | case ACPI_EXD_RGN_LIST: | 534 | case ACPI_EXD_RGN_LIST: |
@@ -562,7 +562,7 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc, | |||
562 | } | 562 | } |
563 | } | 563 | } |
564 | 564 | ||
565 | acpi_os_printf("\n", next); | 565 | acpi_os_printf("\n"); |
566 | break; | 566 | break; |
567 | 567 | ||
568 | case ACPI_EXD_NODE: | 568 | case ACPI_EXD_NODE: |