ACPI: Fix conflict between customized DSDT and DSDT local copy
authorLv Zheng <lv.zheng@intel.com>
Mon, 12 May 2014 07:50:16 +0000 (15:50 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 1 Jul 2014 03:11:58 +0000 (20:11 -0700)
commit3dd4627f51cd62ccb8bcfcdd069b041a102711e7
tree31a58af1c92bd46d151fe055d32cf7244f458bf9
parentf445789dcf3896215254dec320ac91cd69f7b61f
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>
drivers/acpi/bus.c