From 49b0b7f3f0b8e7deb6a2cfec1fe9509a846d9f9e Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 28 Apr 2008 02:14:13 -0700
Subject: [PATCH] --- yaml --- r: 94095 b: refs/heads/master c:
 d83fd8a26769c75d51a6b05d8dcb3e36302dd8ba h: refs/heads/master i:   94093:
 73c6a40c299560f0fc3958ce851e75be5742f81a   94091:
 471687f4bb2ec2bd63f601d550cf167adfc3d292   94087:
 d0ed07aea4deba22abd95aabcd3d76e20af4d9a3   94079:
 1cfee4fc9d8bfee04ba0847bffbc2b89cc161cd2 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/acpi/thermal.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d32375afddea..b21ffea1b64d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e10efefaae45989f2f143bacfef75af55068378
+refs/heads/master: d83fd8a26769c75d51a6b05d8dcb3e36302dd8ba
diff --git a/trunk/drivers/acpi/thermal.c b/trunk/drivers/acpi/thermal.c
index 1bcecc7dd2ca..766bd25d3376 100644
--- a/trunk/drivers/acpi/thermal.c
+++ b/trunk/drivers/acpi/thermal.c
@@ -1710,7 +1710,6 @@ static int acpi_thermal_resume(struct acpi_device *device)
 	return AE_OK;
 }
 
-#ifdef CONFIG_DMI
 static int thermal_act(const struct dmi_system_id *d) {
 
 	if (act == 0) {
@@ -1785,7 +1784,6 @@ static struct dmi_system_id thermal_dmi_table[] __initdata = {
 	},
 	{}
 };
-#endif /* CONFIG_DMI */
 
 static int __init acpi_thermal_init(void)
 {