ACPICA: Fix unmerged acmacros.h divergences.

Browse source

The 20121018 release depends on some unmerged acmaros.h fixes.
This patch includes the fixes made on acmaros.h that will not affect
the generated vmlinux binary.

This patch will not affect the generated vmlinux binary.
This will decrease 157 lines of 20120913 divergence.diff.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

...

This commit is contained in:

Lv Zheng 2012-10-31 02:25:52 +00:00 • committed by Rafael J. Wysocki

parent 1f86e8c1c9

commit 86ff0e508f

2 changed files with 57 additions and 106 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

161

drivers/acpi/acpica/acmacros.h

View file

2

drivers/acpi/acpica/psloop.c

View file