Merge tag 'v4.2-rc3' into next

[cascardo/linux.git] / drivers / input / mouse / elan_i2c_core.c

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 5b5f403..0a076d3 100644 (file)
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1165,6 +1165,7 @@ MODULE_DEVICE_TABLE(i2c, elan_id);
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id elan_acpi_id[] = {
        { "ELAN0000", 0 },
+       { "ELAN0600", 0 },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, elan_acpi_id);
@@ -1181,7 +1182,6 @@ MODULE_DEVICE_TABLE(of, elan_of_match);
 static struct i2c_driver elan_driver = {
        .driver = {
                .name   = DRIVER_NAME,
-               .owner  = THIS_MODULE,
                .pm     = &elan_pm_ops,
                .acpi_match_table = ACPI_PTR(elan_acpi_id),
                .of_match_table = of_match_ptr(elan_of_match),