diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-31 13:59:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-31 13:59:55 +0100 |
| commit | 68066bb378a0504439e046cdb55d88362eb6379d (patch) | |
| tree | 0b60f72ddf7108a63dd4db617b42e07fbae5346d /drivers/input/mouse/elantech.c | |
| parent | spi: dw: fix memory leak on error path (diff) | |
| parent | Linux 3.13-rc6 (diff) | |
| download | linux-68066bb378a0504439e046cdb55d88362eb6379d.tar.xz linux-68066bb378a0504439e046cdb55d88362eb6379d.zip | |
Merge tag 'v3.13-rc6' into spi-dw
To resolve trivial overlaps with fixes.
Linux 3.13-rc6
Diffstat (limited to 'drivers/input/mouse/elantech.c')
| -rw-r--r-- | drivers/input/mouse/elantech.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 8551dcaf24db..597e9b8fc18d 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1313,6 +1313,7 @@ static int elantech_set_properties(struct elantech_data *etd) break; case 6: case 7: + case 8: etd->hw_version = 4; break; default: |