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: move input-polldev to drivers/input
  Input: i8042 - add ULI EV4873 to noloop list
  Input: i8042 - add ASUS P65UP5 to the noloop list
  Input: usbtouchscreen - fix fallout caused by move from drivers/usb

1 files changed, 18 insertions, 0 deletions

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 6858bc58f0f..f4a2517925e 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -69,6 +69,15 @@ static inline void i8042_write_command(int val)
 
 static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
         {
+                /* AUX LOOP command does not raise AUX IRQ */
+                .ident = "ASUS P65UP5",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+                        DMI_MATCH(DMI_BOARD_NAME, "P/I-P65UP5"),
+                        DMI_MATCH(DMI_BOARD_VERSION, "REV 2.X"),
+                },
+        },
+        {
                 .ident = "Compaq Proliant 8500",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
@@ -92,6 +101,15 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
                         DMI_MATCH(DMI_PRODUCT_VERSION, "00"),
                 },
         },
+        {
+                /* AUX LOOP does not work properly */
+                .ident = "ULI EV4873",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ULI"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "EV4873"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "5a"),
+                },
+        },
         { }
 };