* alecrim@xxxxxxxxx <alecrim@xxxxxxxxx> [080306 08:18]: > From: Eduardo Valentin <eduardo.valenti@xxxxxxxxxxx> > > Changed LONG(x) to BIT_WORD(x). > > Signed-off-by: Eduardo Valentin <eduardo.valentin@xxxxxxxxxxx> > Signed-off-by: Francisco Alecrim <francisco.alecrim@xxxxxxxxxxx> > --- > drivers/input/keyboard/innovator_ps2.c | 2 +- > drivers/input/touchscreen/omap/omap_ts.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/keyboard/innovator_ps2.c b/drivers/input/keyboard/innovator_ps2.c > index 0f95f9f..b3c4a06 100644 > --- a/drivers/input/keyboard/innovator_ps2.c > +++ b/drivers/input/keyboard/innovator_ps2.c > @@ -1214,7 +1214,7 @@ innovator_kbd_init(void) > memset(hid, 0, sizeof(struct innovator_hid_dev)); > hid->mouse = input_allocate_device(); > hid->mouse->evbit[0] = BIT(EV_KEY) | BIT(EV_REL); > - hid->mouse->keybit[LONG(BTN_MOUSE)] = > + hid->mouse->keybit[BIT_WORD(BTN_MOUSE)] = > BIT(BTN_LEFT) | BIT(BTN_RIGHT) | > BIT(BTN_MIDDLE) | BIT(BTN_TOUCH); > hid->mouse->relbit[0] = BIT(REL_X) | BIT(REL_Y); > diff --git a/drivers/input/touchscreen/omap/omap_ts.c b/drivers/input/touchscreen/omap/omap_ts.c > index 14dfc6a..ee85755 100644 > --- a/drivers/input/touchscreen/omap/omap_ts.c > +++ b/drivers/input/touchscreen/omap/omap_ts.c > @@ -177,7 +177,7 @@ static int __init omap_ts_probe(struct platform_device *pdev) > ts_omap.inputdevice->name = OMAP_TS_NAME; > ts_omap.inputdevice->dev = &pdev->dev; > ts_omap.inputdevice->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); > - ts_omap.inputdevice->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH); > + ts_omap.inputdevice->keybit[BIT_WORD(BTN_TOUCH)] |= BIT(BTN_TOUCH); > ts_omap.inputdevice->absbit[0] = > BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE); > input_register_device(ts_omap.inputdevice); Pushing today. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
