Merge branch 'freezer'

[linux-2.6-microblaze.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 29ca0bb..0f175f5 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -498,7 +498,8 @@ void input_set_abs_params(struct input_dev *dev, unsigned int axis,
        absinfo->fuzz = fuzz;
        absinfo->flat = flat;
 
-       dev->absbit[BIT_WORD(axis)] |= BIT_MASK(axis);
+       __set_bit(EV_ABS, dev->evbit);
+       __set_bit(axis, dev->absbit);
 }
 EXPORT_SYMBOL(input_set_abs_params);
 
@@ -1788,7 +1789,7 @@ struct input_dev *input_allocate_device(void)
                INIT_LIST_HEAD(&dev->h_list);
                INIT_LIST_HEAD(&dev->node);
 
-               dev_set_name(&dev->dev, "input%ld",
+               dev_set_name(&dev->dev, "input%lu",
                             (unsigned long) atomic_inc_return(&input_no) - 1);
 
                __module_get(THIS_MODULE);