diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2012-10-31 02:25:05 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-15 00:31:21 +0100 |
| commit | 6d33b6be17dd6a0934396704f969ceb7f3206347 (patch) | |
| tree | 4cf68009186944acd1b8ef10fb2b5b87e8c0c2f3 /drivers/acpi/acpica/Makefile | |
| parent | 45dcd31547fcd58273423799b12efe0e8371127e (diff) | |
ACPICA: Fix unmerged utility divergences.
Utility improvements in ACPICA are partial ignored by ACPICA Linux
release. This will lead to divergences between Linux and ACPICA.
This patch ports the entire "utility" into Linux and makes them
igored in the compilation stage by "ACPI_FUTURE_USAGE".
The following "Utility" files have been ported into the Linux:
drivers/acpi/uttrack.c
drivers/acpi/utcache.c
drivers/acpi/utids.c
This patch will not affect the generated vmlinx binary.
This will decrease 274 lines of 20120913 divergence.diff.
Signed-off-by: Robert Moore <robert.moore@intel.com>
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/Makefile')
| -rw-r--r-- | drivers/acpi/acpica/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile index 7f1d40797e80..c8bc24bd1f72 100644 --- a/drivers/acpi/acpica/Makefile +++ b/drivers/acpi/acpica/Makefile @@ -161,3 +161,6 @@ acpi-y += \ utxfinit.o \ utxferror.o \ utxfmutex.o + +acpi-$(ACPI_FUTURE_USAGE) += uttrack.o utcache.o utclib.o + |