Sync up with 'for-linus' branch to resolve conflict in Elan touchpad driver.
Showing the changes to include/linux (2 of 9 files). Show all
Unified · Split
| @@ -67,8 +67,15 @@ static const struct acpi_device_id elan_acpi_id[] = { · 66 unmodified lines | ||
| 67 | 67 | { "ELAN062B", 0 }, |
| 68 | 68 | { "ELAN062C", 0 }, |
| 69 | 69 | { "ELAN062D", 0 }, |
| 70 | + { "ELAN062E", 0 }, /* Lenovo V340 Whiskey Lake U */ | |
| 71 | + { "ELAN062F", 0 }, /* Lenovo V340 Comet Lake U */ | |
| 70 | 72 | { "ELAN0631", 0 }, |
| 71 | 73 | { "ELAN0632", 0 }, |
| 74 | + { "ELAN0633", 0 }, /* Lenovo S145 */ | |
| 75 | + { "ELAN0634", 0 }, /* Lenovo V340 Ice lake */ | |
| 76 | + { "ELAN0635", 0 }, /* Lenovo V1415-IIL */ | |
| 77 | + { "ELAN0636", 0 }, /* Lenovo V1415-Dali */ | |
| 78 | + { "ELAN0637", 0 }, /* Lenovo V1415-IGLR */ | |
| 72 | 79 | { "ELAN1000", 0 }, |
| 73 | 80 | { } |
| 74 | 81 | }; |
| @@ -318,7 +318,7 @@ struct pcmcia_device_id { · 317 unmodified lines | ||
| 318 | 318 | #define INPUT_DEVICE_ID_LED_MAX 0x0f |
| 319 | 319 | #define INPUT_DEVICE_ID_SND_MAX 0x07 |
| 320 | 320 | #define INPUT_DEVICE_ID_FF_MAX 0x7f |
| 321 | −#define INPUT_DEVICE_ID_SW_MAX 0x0f | |
| 321 | +#define INPUT_DEVICE_ID_SW_MAX 0x10 | |
| 322 | 322 | #define INPUT_DEVICE_ID_PROP_MAX 0x1f |
| 323 | 323 | |
| 324 | 324 | #define INPUT_DEVICE_ID_MATCH_BUS 1 |