* [patch 2.6.24-rc3-omap1] tsc210x build fixes
@ 2007-11-24 7:20 David Brownell
2007-11-28 20:49 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: David Brownell @ 2007-11-24 7:20 UTC (permalink / raw)
To: linux-omap-open-source
Build fixes for the tsc210x driver.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
--- a/drivers/hwmon/tsc210x_sensors.c
+++ b/drivers/hwmon/tsc210x_sensors.c
@@ -41,7 +41,7 @@ #include <linux/spi/tsc210x.h>
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 */
--- a/drivers/input/touchscreen/tsc210x_ts.c
+++ b/drivers/input/touchscreen/tsc210x_ts.c
@@ -96,7 +96,7 @@ static int tsc210x_ts_probe(struct platf
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;
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [patch 2.6.24-rc3-omap1] tsc210x build fixes
2007-11-24 7:20 [patch 2.6.24-rc3-omap1] tsc210x build fixes David Brownell
@ 2007-11-28 20:49 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2007-11-28 20:49 UTC (permalink / raw)
To: David Brownell; +Cc: linux-omap-open-source
* David Brownell <david-b@pacbell.net> [071123 23:24]:
> Build fixes for the tsc210x driver.
>
> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
>
> --- a/drivers/hwmon/tsc210x_sensors.c
> +++ b/drivers/hwmon/tsc210x_sensors.c
> @@ -41,7 +41,7 @@ #include <linux/spi/tsc210x.h>
> 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 */
> --- a/drivers/input/touchscreen/tsc210x_ts.c
> +++ b/drivers/input/touchscreen/tsc210x_ts.c
> @@ -96,7 +96,7 @@ static int tsc210x_ts_probe(struct platf
> 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;
Pushing today.
Tony
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-11-28 20:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-24 7:20 [patch 2.6.24-rc3-omap1] tsc210x build fixes David Brownell
2007-11-28 20:49 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox