From: Eduardo Valentin Date: Thu, 6 Mar 2008 06:17:57 +0000 (+0200) Subject: Compile fix on innovator_ps2.c and omap_ts.c X-Git-Tag: v2.6.25-omap1~146 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=073e5bbfc0bd81cf7c0062a760c925458e23da73;p=linux-2.6-omap-h63xx.git Compile fix on innovator_ps2.c and omap_ts.c Changed LONG(x) to BIT_WORD(x). Signed-off-by: Eduardo Valentin Signed-off-by: Francisco Alecrim Signed-off-by: Tony Lindgren --- diff --git a/drivers/input/keyboard/innovator_ps2.c b/drivers/input/keyboard/innovator_ps2.c index 0f95f9f1b56..b3c4a0636b5 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 14dfc6afe26..ee857550662 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);