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

Pull 2nd round of input updates from Dmitry Torokhov:
 - update to Wacom driver to support wireless devices
 - update to Sentelci touchpad driver to support newer hardware
 - update to gpio-keys driver to support "interrupt-only" keys
 - fixups to earlier commits

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wacom - check for allocation failure in probe()
  Input: tegra-kbc - allocate pdata before using it
  Input: amijoy - add missing platform check
  Input: wacom - wireless battery status
  Input: wacom - create inputs when wireless connect
  Input: wacom - wireless monitor framework
  Input: wacom - isolate input registration
  Input: sentelic - improve packet debugging information
  Input: sentelic - minor code cleanup
  Input: sentelic - enabling absolute coordinates output for newer hardware
  Input: sentelic - refactor code for upcoming new hardware support
  Input: gpio_keys - add support for interrupt only keys
  Input: gpio_keys - consolidate key destructor code
  Input: revert "gpio_keys - switch to using threaded IRQs"
  Input: gpio_keys - constify platform data
  Input: spear-keyboard - remove kbd_set_plat_data()

diff --combined drivers/input/joystick/amijoy.c
index 24044dacbf70086a90c6191dc9e310a0608b84ca,3aa93bf60ae352222396ebc47ada23c23968cb01..c65b5fa69f1eb9b5d7fa75356d2dd9d91abc8cb4
--- 1/drivers/input/joystick/amijoy.c
--- 2/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@@ -35,6 -35,7 +35,6 @@@
  #include <linux/interrupt.h>
  #include <linux/mutex.h>
  
 -#include <asm/system.h>
  #include <asm/amigahw.h>
  #include <asm/amigaints.h>
  
@@@ -107,6 -108,9 +107,9 @@@ static int __init amijoy_init(void
        int i, j;
        int err;
  
+       if (!MACH_IS_AMIGA)
+               return -ENODEV;
+ 
        for (i = 0; i < 2; i++) {
                if (!amijoy[i])
                        continue;