From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/misc/thinkpad_acpi.c | 2 +- drivers/misc/thinkpad_acpi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/misc/thinkpad_acpi.c~git-hwmon-fixup drivers/misc/thinkpad_acpi.c --- a/drivers/misc/thinkpad_acpi.c~git-hwmon-fixup +++ a/drivers/misc/thinkpad_acpi.c @@ -527,7 +527,7 @@ static char *next_cmd(char **cmds) static struct platform_device *tpacpi_pdev; static struct platform_device *tpacpi_sensors_pdev; -static struct class_device *tpacpi_hwmon; +static struct device *tpacpi_hwmon; static struct input_dev *tpacpi_inputdev; static struct mutex tpacpi_inputdev_send_mutex; diff -puN drivers/misc/thinkpad_acpi.h~git-hwmon-fixup drivers/misc/thinkpad_acpi.h --- a/drivers/misc/thinkpad_acpi.h~git-hwmon-fixup +++ a/drivers/misc/thinkpad_acpi.h @@ -173,7 +173,7 @@ static int parse_strtoul(const char *buf /* Device model */ static struct platform_device *tpacpi_pdev; static struct platform_device *tpacpi_sensors_pdev; -static struct class_device *tpacpi_hwmon; +static struct device *tpacpi_hwmon; static struct platform_driver tpacpi_pdriver; static struct input_dev *tpacpi_inputdev; static int tpacpi_create_driver_attributes(struct device_driver *drv); _