From: Lv Zheng <lv.zheng@intel.com>
Date: Mon, 12 May 2014 07:50:16 +0000 (+0800)
Subject: ACPI: Fix conflict between customized DSDT and DSDT local copy
X-Git-Tag: upstream/snapshot3+hdmi~2337
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3dd4627f51cd62ccb8bcfcdd069b041a102711e7;hp=3dd4627f51cd62ccb8bcfcdd069b041a102711e7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

ACPI: Fix conflict between customized DSDT and DSDT local copy

commit 73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 upstream.

This patch fixes the following issue:
If DSDT is customized, no local DSDT copy is needed.

References: https://bugzilla.kernel.org/show_bug.cgi?id=69711
Signed-off-by: Enrico Etxe Arte <goitizena.generoa@gmail.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
[rjw: Subject]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---