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

Pull input updates from Dmitry Torokhov:
 "Small driver fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data
  Input: adxl34x - make it enumerable in ACPI environment
  Input: ALPS - fix TrackStick Y axis handling for SS5 hardware
  Input: synaptics-rmi4 - fix F03 build error when serio is module
  Input: xpad - use correct product id for x360w controllers
  Input: synaptics_i2c - change msleep to usleep_range for small msecs
  Input: i8042 - add Pegatron touchpad to noloop table
  Input: joydev - remove unused linux/miscdevice.h include

diff --combined drivers/input/serio/i8042-x86ia64io.h
index 77551f52220275c0589419ced9f7037cc11062b0,381d802fe8531abebe29bc1e0e3010a1e8c4bd37..a7618776705ab929e42d4c3e870b4911f1a30d9c
--- 1/drivers/input/serio/i8042-x86ia64io.h
--- 2/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@@ -211,6 -211,12 +211,12 @@@ static const struct dmi_system_id __ini
                        DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
                },
        },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "C15B"),
+               },
+       },
        { }
  };
  
@@@ -983,11 -989,7 +989,11 @@@ static int __init i8042_pnp_init(void
  #if defined(__ia64__)
                return -ENODEV;
  #else
 -              pr_info("PNP: No PS/2 controller found. Probing ports directly.\n");
 +              pr_info("PNP: No PS/2 controller found.\n");
 +              if (x86_platform.legacy.i8042 !=
 +                              X86_LEGACY_I8042_EXPECTED_PRESENT)
 +                      return -ENODEV;
 +              pr_info("Probing ports directly.\n");
                return 0;
  #endif
        }
@@@ -1074,8 -1076,8 +1080,8 @@@ static int __init i8042_platform_init(v
  
  #ifdef CONFIG_X86
        u8 a20_on = 0xdf;
 -      /* Just return if pre-detection shows no i8042 controller exist */
 -      if (!x86_platform.i8042_detect())
 +      /* Just return if platform does not have i8042 controller */
 +      if (x86_platform.legacy.i8042 == X86_LEGACY_I8042_PLATFORM_ABSENT)
                return -ENODEV;
  #endif