1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/misc/ibmasm/remote.c b/drivers/misc/ibmasm/remote.c
index 0550ce075fc4..1d9defb1a10c 100644
--- a/drivers/misc/ibmasm/remote.c
+++ b/drivers/misc/ibmasm/remote.c
@@ -226,9 +226,9 @@ int ibmasm_init_remote_input_dev(struct service_processor *sp)
         mouse_dev->id.product = pdev->device;
         mouse_dev->id.version = 1;
         mouse_dev->dev.parent = sp->dev;
-        mouse_dev->evbit[0]  = BIT(EV_KEY) | BIT(EV_ABS);
-        mouse_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) |
-                BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
+        mouse_dev->evbit[0]  = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        mouse_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
         set_bit(BTN_TOUCH, mouse_dev->keybit);
         mouse_dev->name = "ibmasm RSA I remote mouse";
         input_set_abs_params(mouse_dev, ABS_X, 0, MOUSE_X_MAX, 0, 0);
@@ -239,7 +239,7 @@ int ibmasm_init_remote_input_dev(struct service_processor *sp)
         keybd_dev->id.product = pdev->device;
         keybd_dev->id.version = 2;
         keybd_dev->dev.parent = sp->dev;
-        keybd_dev->evbit[0]  = BIT(EV_KEY);
+        keybd_dev->evbit[0]  = BIT_MASK(EV_KEY);
         keybd_dev->name = "ibmasm RSA I remote keyboard";
 
         for (i = 0; i < XLATE_SIZE; i++) {