Merge branch 'next' into for-linus

[platform/kernel/linux-rpi.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 0e7f3d0..1365c9d 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -2335,12 +2335,6 @@ int input_register_device(struct input_dev *dev)
        /* KEY_RESERVED is not supposed to be transmitted to userspace. */
        __clear_bit(KEY_RESERVED, dev->keybit);
 
-       /* Buttonpads should not map BTN_RIGHT and/or BTN_MIDDLE. */
-       if (test_bit(INPUT_PROP_BUTTONPAD, dev->propbit)) {
-               __clear_bit(BTN_RIGHT, dev->keybit);
-               __clear_bit(BTN_MIDDLE, dev->keybit);
-       }
-
        /* Make sure that bitmasks not mentioned in dev->evbit are clean. */
        input_cleanse_bitmasks(dev);