aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/ads7846.c
diff options
context:
space:
mode:
authorTony Jones <tonyj@suse.de>2007-08-20 16:46:20 -0400
committerMark M. Hoffman <mhoffman@lightlink.com>2007-10-09 22:56:30 -0400
commit1beeffe43311f64df8dd0ab08ff6b1858c58363f (patch)
tree039324186049a69f3c791165e90404aef497f3cc /drivers/input/touchscreen/ads7846.c
parent59a35bafb223bbb0553ba1a3bb9280bda668a8d8 (diff)
hwmon: Convert from class_device to device
Convert from class_device to device for hwmon_device_register/unregister Signed-off-by: Tony Jones <tonyj@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Diffstat (limited to 'drivers/input/touchscreen/ads7846.c')
-rw-r--r--drivers/input/touchscreen/ads7846.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 96581d08774f..51ae4fb7d123 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -83,7 +83,7 @@ struct ads7846 {
83 83
84#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE) 84#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
85 struct attribute_group *attr_group; 85 struct attribute_group *attr_group;
86 struct class_device *hwmon; 86 struct device *hwmon;
87#endif 87#endif
88 88
89 u16 model; 89 u16 model;
@@ -369,7 +369,7 @@ static struct attribute_group ads7845_attr_group = {
369 369
370static int ads784x_hwmon_register(struct spi_device *spi, struct ads7846 *ts) 370static int ads784x_hwmon_register(struct spi_device *spi, struct ads7846 *ts)
371{ 371{
372 struct class_device *hwmon; 372 struct device *hwmon;
373 int err; 373 int err;
374 374
375 /* hwmon sensors need a reference voltage */ 375 /* hwmon sensors need a reference voltage */