diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:16:24 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-07-17 12:16:24 +0800 |
commit | fe4c808f845e2ff3a3fb6c66009ab69c8d01bf57 (patch) | |
tree | 82ce8b6476c1c4c84ab05a49c94317f1ce8ac1b7 /drivers/input/mouse/elantech.c | |
parent | bbe8f0ee88a1eb4bb1e72e593b008faf387f30ac (diff) | |
parent | 0ac0a856d986c1ab240753479f5e50fdfab82b14 (diff) |
Merge tag 'v3.18.37' into linux-linaro-lsk-v3.18lsk-v3.18-16.07
This is the 3.18.37 stable release
Diffstat (limited to 'drivers/input/mouse/elantech.c')
-rw-r--r-- | drivers/input/mouse/elantech.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index b3b2a137e55e..8c964907d291 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1550,12 +1550,7 @@ static int elantech_set_properties(struct elantech_data *etd) case 5: etd->hw_version = 3; break; - case 6: - case 7: - case 8: - case 9: - case 10: - case 13: + case 6 ... 14: etd->hw_version = 4; break; default: |