From 5d55a7671bf151b58809340d4d63d7eabaca0a5d Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 3 Mar 2009 12:47:17 +1100
Subject: [PATCH] --- yaml --- r: 141903 b: refs/heads/master c:
 f6f5c45e06e86d94621cd5c1c4508bdee1952fc8 h: refs/heads/master i:   141901:
 d8acd56c79d427dd118f04b6b4eb7b157704c748   141899:
 6bc150b154d9dec3b17f2ae4ad575f1ed7d2c2d3   141895:
 29420be7c1135bcdb31f44a263a13c14e035ff8b   141887:
 aacb4f838b0eda33640d3a235aad151dbb62930a v: v3

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

diff --git a/[refs] b/[refs]
index 896ce1e85027..3aaddbc2f35c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1569e99c795bf83b4ddf41c4f1c42761ab7f75e
+refs/heads/master: f6f5c45e06e86d94621cd5c1c4508bdee1952fc8
diff --git a/trunk/drivers/acpi/thermal.c b/trunk/drivers/acpi/thermal.c
index 0ec48d2f85c5..6b959976b7a4 100644
--- a/trunk/drivers/acpi/thermal.c
+++ b/trunk/drivers/acpi/thermal.c
@@ -41,6 +41,7 @@
 #include <linux/kmod.h>
 #include <linux/seq_file.h>
 #include <linux/reboot.h>
+#include <linux/device.h>
 #include <asm/uaccess.h>
 #include <linux/thermal.h>
 #include <acpi/acpi_bus.h>
@@ -765,7 +766,7 @@ static int thermal_notify(struct thermal_zone_device *thermal, int trip,
 
 	acpi_bus_generate_proc_event(tz->device, type, 1);
 	acpi_bus_generate_netlink_event(tz->device->pnp.device_class,
-					tz->device->dev.bus_id, type, 1);
+					dev_name(&tz->device->dev), type, 1);
 
 	if (trip_type == THERMAL_TRIP_CRITICAL && nocrt)
 		return 1;