Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: jornada720_ts - fix build error ( LONG() usage )
  Input: bcm5974 - switch back to normal mode when closing

diff --combined drivers/input/touchscreen/jornada720_ts.c
index bf44f9d68342bdcd41f4b63ed87737d60e8f70cf,b7f1260738a6dd11b5be14e5f559d157428dcddb..c8b7e8a45c4d91292c09afeb239be90efe598c79
--- 1/drivers/input/touchscreen/jornada720_ts.c
--- 2/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
@@@ -19,8 -19,8 +19,8 @@@
  #include <linux/interrupt.h>
  #include <linux/module.h>
  
 -#include <asm/hardware.h>
 -#include <asm/arch/jornada720.h>
 +#include <mach/hardware.h>
 +#include <mach/jornada720.h>
  
  MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
  MODULE_DESCRIPTION("HP Jornada 710/720/728 touchscreen driver");
@@@ -119,8 -119,8 +119,8 @@@ static int __devinit jornada720_ts_prob
        input_dev->id.bustype = BUS_HOST;
        input_dev->dev.parent = &pdev->dev;
  
-       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-       input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+       input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+       input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
        input_set_abs_params(input_dev, ABS_X, 270, 3900, 0, 0);
        input_set_abs_params(input_dev, ABS_Y, 180, 3700, 0, 0);