diff options
| author | Dmitry Torokhov | 2015-09-11 11:02:36 -0500 |
|---|---|---|
| committer | Dmitry Torokhov | 2015-09-11 11:02:36 -0500 |
| commit | 53431d0a3534263168c8ee576bad1c2c3a4cd9e0 (patch) | |
| tree | 84b3dda2e2409d1eda7c2273053c78cd6aa3a677 /drivers/input/mouse | |
| parent | 01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba (diff) | |
| parent | ade9c1a47c811a7ae1c874882ad9178af1ed1098 (diff) | |
| download | kernel-omap-53431d0a3534263168c8ee576bad1c2c3a4cd9e0.tar.gz kernel-omap-53431d0a3534263168c8ee576bad1c2c3a4cd9e0.tar.xz kernel-omap-53431d0a3534263168c8ee576bad1c2c3a4cd9e0.zip | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.3 merge window.
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/elan_i2c_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index e2b7420eed97..fa945304b9a5 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c | |||
| @@ -1170,6 +1170,7 @@ static const struct acpi_device_id elan_acpi_id[] = { | |||
| 1170 | { "ELAN0000", 0 }, | 1170 | { "ELAN0000", 0 }, |
| 1171 | { "ELAN0100", 0 }, | 1171 | { "ELAN0100", 0 }, |
| 1172 | { "ELAN0600", 0 }, | 1172 | { "ELAN0600", 0 }, |
| 1173 | { "ELAN1000", 0 }, | ||
| 1173 | { } | 1174 | { } |
| 1174 | }; | 1175 | }; |
| 1175 | MODULE_DEVICE_TABLE(acpi, elan_acpi_id); | 1176 | MODULE_DEVICE_TABLE(acpi, elan_acpi_id); |