diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-02 20:47:17 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-03-27 16:58:12 -0400 |
commit | f6f5c45e06e86d94621cd5c1c4508bdee1952fc8 (patch) | |
tree | 9829f24c286fffc12bcac2508859787217148f00 | |
parent | b1569e99c795bf83b4ddf41c4f1c42761ab7f75e (diff) |
ACPI: update thermal for bus_id removal
> drivers/acpi/thermal.c: In function 'thermal_notify':
> drivers/acpi/thermal.c:768: error: 'struct device' has no member named 'bus_id'
>
> Caused by commit b1569e99c795bf83b4ddf41c4f1c42761ab7f75e ("ACPI: move
> thermal trip handling to generic thermal layer") interacting with commit
> d4a078fca590911cdf87a8eaffee1b6e643c2558 ("driver core: get rid of struct
> device's bus_id string array").
>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/acpi/thermal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 0ec48d2f85c5..6b959976b7a4 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <linux/kmod.h> | 41 | #include <linux/kmod.h> |
42 | #include <linux/seq_file.h> | 42 | #include <linux/seq_file.h> |
43 | #include <linux/reboot.h> | 43 | #include <linux/reboot.h> |
44 | #include <linux/device.h> | ||
44 | #include <asm/uaccess.h> | 45 | #include <asm/uaccess.h> |
45 | #include <linux/thermal.h> | 46 | #include <linux/thermal.h> |
46 | #include <acpi/acpi_bus.h> | 47 | #include <acpi/acpi_bus.h> |
@@ -765,7 +766,7 @@ static int thermal_notify(struct thermal_zone_device *thermal, int trip, | |||
765 | 766 | ||
766 | acpi_bus_generate_proc_event(tz->device, type, 1); | 767 | acpi_bus_generate_proc_event(tz->device, type, 1); |
767 | acpi_bus_generate_netlink_event(tz->device->pnp.device_class, | 768 | acpi_bus_generate_netlink_event(tz->device->pnp.device_class, |
768 | tz->device->dev.bus_id, type, 1); | 769 | dev_name(&tz->device->dev), type, 1); |
769 | 770 | ||
770 | if (trip_type == THERMAL_TRIP_CRITICAL && nocrt) | 771 | if (trip_type == THERMAL_TRIP_CRITICAL && nocrt) |
771 | return 1; | 772 | return 1; |