summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/bus.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2014-05-12 15:50:16 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-17 01:55:33 +0200
commit73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 (patch)
tree1afd424d948889a4318b6ffec757fd150c8e07d1 /drivers/acpi/bus.c
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c (diff)
downloadlinux-73577d1df8e1f31f6b1a5eebcdbc334eb0330e47.tar.bz2
ACPI: Fix conflict between customized DSDT and DSDT local copy
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> Cc: 2.6.35+ <stable@vger.kernel.org> # 2.6.35+ [rjw: Subject] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r--drivers/acpi/bus.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index cf925c4f36b7..ed9fca0250fa 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -52,6 +52,12 @@ struct proc_dir_entry *acpi_root_dir;
EXPORT_SYMBOL(acpi_root_dir);
#ifdef CONFIG_X86
+#ifdef CONFIG_ACPI_CUSTOM_DSDT
+static inline int set_copy_dsdt(const struct dmi_system_id *id)
+{
+ return 0;
+}
+#else
static int set_copy_dsdt(const struct dmi_system_id *id)
{
printk(KERN_NOTICE "%s detected - "
@@ -59,6 +65,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
acpi_gbl_copy_dsdt_locally = 1;
return 0;
}
+#endif
static struct dmi_system_id dsdt_dmi_table[] __initdata = {
/*