ARM: OMAP: Misc compile fixes after updating to current mainline tree

[linux-2.6-omap-h63xx.git] / drivers / cbus / retu-pwrbutton.c

diff --git a/drivers/cbus/retu-pwrbutton.c b/drivers/cbus/retu-pwrbutton.c
index ad37b6d051beb07898223accc780ca8da5884df1..283d9cae7b06a443b0e3970604ac218c00690d80 100644 (file)
--- a/drivers/cbus/retu-pwrbutton.c
+++ b/drivers/cbus/retu-pwrbutton.c
@@ -30,6 +30,7 @@
 #include <linux/input.h>
 #include <linux/timer.h>
 #include <linux/jiffies.h>
+#include <linux/bitops.h>
 
 #include "retu.h"
 
@@ -92,8 +93,8 @@ static int __init retubutton_init(void)
        if (!pwrbtn_dev)
                return -ENOMEM;
 
-       pwrbtn_dev->evbit[0] = BIT(EV_KEY);
-       pwrbtn_dev->keybit[LONG(KEY_POWER)] = BIT(KEY_POWER);
+       pwrbtn_dev->evbit[0] = BIT_MASK(EV_KEY);
+       pwrbtn_dev->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
        pwrbtn_dev->name = "retu-pwrbutton";
 
        input_register_device(pwrbtn_dev);