ACPICA: Fix divergences of the commit - ACPICA: Expose OSI version.
authorLv Zheng <lv.zheng@intel.com>
Thu, 8 Aug 2013 07:29:46 +0000 (15:29 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 13 Aug 2013 11:13:09 +0000 (13:13 +0200)
commit2641f540800b47a1b9e9d8ce9d682fc15df088e2
tree68033c6e7648ff842f102fd75a01849f4c577f39
parentbf0dd264b1207b090858e7847919af5f2e367d7c
ACPICA: Fix divergences of the commit - ACPICA: Expose OSI version.

The original commit 242b2287cd7f27521c8b54a4101d569e53e7a0ca "ACPICA:
expose OSI version" triggers build errors in ACPICA when it is back
ported.  The patch removes the divergences between Linux and upstream
ACPICA resulting from that.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpica/acglobal.h
drivers/acpi/acpica/utglobal.c
include/acpi/actypes.h