tsc210x build fixes

Build fixes for the tsc210x driver.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/drivers/hwmon/tsc210x_sensors.c b/drivers/hwmon/tsc210x_sensors.c
index 83b267853c267772052b8cbffb4c8b93b0ac7a76..daac126209c0490d4de2ced30cd6721086f3ae9c 100644 (file)
--- a/drivers/hwmon/tsc210x_sensors.c
+++ b/drivers/hwmon/tsc210x_sensors.c
@@ -41,7 +41,7 @@
 struct tsc210x_hwmon {
        int bat[2], aux[2], temp[2];
 
-       struct class_device *dev;
+       struct device *dev;
        struct tsc210x_config *pdata;
 #ifdef CONFIG_APM
        /* prevent APM from colliding with normal hwmon accessors */

diff --git a/drivers/input/touchscreen/tsc210x_ts.c b/drivers/input/touchscreen/tsc210x_ts.c
index ae2c77f43ba4f25ffd0df42f44e24b92c1223c2e..7bcee0efe7c27ae4252c12f9b63be47e85d18a8d 100644 (file)
--- a/drivers/input/touchscreen/tsc210x_ts.c
+++ b/drivers/input/touchscreen/tsc210x_ts.c
@@ -96,7 +96,7 @@ static int tsc210x_ts_probe(struct platform_device *pdev)
        dev->name = "TSC210x Touchscreen";
        dev->cdev.dev = &pdev->dev;
        dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-       dev->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
+       dev->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
        dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE);
        dev->phys = "tsc210x/input0";
        dev->id.bustype = BUS_HOST;