From: David Brownell Date: Sat, 24 Nov 2007 07:20:36 +0000 (-0800) Subject: tsc210x build fixes X-Git-Tag: v2.6.24-omap1~145 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5bcda09b77b6b67aedc0928b87878e24d59de2e3;p=linux-2.6-omap-h63xx.git tsc210x build fixes Build fixes for the tsc210x driver. Signed-off-by: David Brownell --- diff --git a/drivers/hwmon/tsc210x_sensors.c b/drivers/hwmon/tsc210x_sensors.c index 83b267853c2..daac126209c 100644 --- 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 ae2c77f43ba..7bcee0efe7c 100644 --- 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;