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: synaptics - relax capability ID checks on newer hardware
  Input: twl40300-keypad - fix handling of "all ground" rows
  Input: gamecon - reference correct pad in gc_psx_command()
  Input: gamecon - reference correct input device in NES mode
  Input: w90p910_keypad - change platfrom driver name to 'nuc900-kpi'
  Input: i8042 - add Gigabyte Spring Peak to dmi_noloop_table
  Input: qt2160 - rename kconfig symbol name

diff --combined drivers/input/keyboard/Kconfig
index 3525f533e186d3f3cf0e7990d9efa4af90a66d85,c96ccc136492f023c850666ec2d987a381ae553a..1ba25145b333bb79628d2b08c106825ed1c5c5fa
--- 1/drivers/input/keyboard/Kconfig
--- 2/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -69,11 -69,11 +69,11 @@@ config KEYBOARD_ATAR
          module will be called atakbd.
  
  config KEYBOARD_ATKBD
 -      tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST
 +      tristate "AT keyboard" if EMBEDDED || !X86
        default y
        select SERIO
        select SERIO_LIBPS2
 -      select SERIO_I8042 if X86 && !X86_MRST
 +      select SERIO_I8042 if X86
        select SERIO_GSCPS2 if GSC
        help
          Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
@@@ -124,7 -124,7 +124,7 @@@ config KEYBOARD_ATKBD_RDI_KEYCODE
          right-hand column will be interpreted as the key shown in the
          left-hand column.
  
- config QT2160
+ config KEYBOARD_QT2160
        tristate "Atmel AT42QT2160 Touch Sensor Chip"
        depends on I2C && EXPERIMENTAL
        help

diff --combined drivers/input/serio/i8042-x86ia64io.h
index 81003c4739f4f32351566759b9225fdfb974a7b7,42201c538086fbbabc4ec1cfbc951d98c91be1bc..ed7ad7416b24d8f40c9cccd61d8371f732b73441
--- 1/drivers/input/serio/i8042-x86ia64io.h
--- 2/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@@ -7,10 -7,6 +7,10 @@@
   * the Free Software Foundation.
   */
  
 +#ifdef CONFIG_X86
 +#include <asm/x86_init.h>
 +#endif
 +
  /*
   * Names.
   */
@@@ -169,6 -165,13 +169,13 @@@ static const struct dmi_system_id __ini
                        DMI_MATCH(DMI_BOARD_VERSION, "1.02"),
                },
        },
+       {
+               /* Gigabyte Spring Peak - defines wrong chassis type */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Spring Peak"),
+               },
+       },
        {
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
@@@ -844,12 -847,6 +851,12 @@@ static int __init i8042_platform_init(v
  {
        int retval;
  
 +#ifdef CONFIG_X86
 +      /* Just return if pre-detection shows no i8042 controller exist */
 +      if (!x86_platform.i8042_detect())
 +              return -ENODEV;
 +#endif
 +
  /*
   * On ix86 platforms touching the i8042 data register region can do really
   * bad things. Because of this the region is always reserved on ix86 boxes.