Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 16 Dec 2016 17:31:17 +0000 (09:31 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 16 Dec 2016 17:31:17 +0000 (09:31 -0800)
Prepare input updates for 4.10 merge window.

1  2 
drivers/input/serio/i8042-x86ia64io.h

index 073246c7d1634eef411c1bf07d7f72ab47cad369,21e134798ba396ea4fac022c829f32661abd352d..73a4e68448fc57fef4a09f0ccaacf19c41790acf
@@@ -517,79 -517,7 +517,7 @@@ static const struct dmi_system_id i8042
        {
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "A455LD"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "K401LB"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "K501LB"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "K501LX"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "R409L"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "V502LX"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X302LA"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X450LCP"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X450LD"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X455LAB"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X455LDB"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X455LF"),
-               },
-       },
-       {
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Z450LA"),
+                       DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */
                },
        },
        { }
@@@ -877,13 -805,6 +805,13 @@@ static const struct dmi_system_id __ini
                        DMI_MATCH(DMI_PRODUCT_NAME, "P34"),
                },
        },
 +      {
 +              /* Schenker XMG C504 - Elantech touchpad */
 +              .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "XMG"),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "C504"),
 +              },
 +      },
        { }
  };
  
@@@ -1131,10 -1052,10 +1059,10 @@@ static int __init i8042_pnp_init(void
        return 0;
  }
  
- #else
+ #else  /* !CONFIG_PNP */
  static inline int i8042_pnp_init(void) { return 0; }
  static inline void i8042_pnp_exit(void) { }
- #endif
+ #endif /* CONFIG_PNP */
  
  static int __init i8042_platform_init(void)
  {