dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' into next

Browse Source 
Sync up with 'for-linus' branch to resolve conflict in Elan touchpad
driver.
This commit is contained in:
Dmitry Torokhov
2020-07-21 22:17:27 -07:00
parent 9b031c8650 a50ca29523
commit a5c33d5f74
9 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/uapi/linux/input-event-codes.h
+2 -1
View File
@@ -888,7 +888,8 @@
#define SW_LINEIN_INSERT 0x0d /* set = inserted */
#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
#define SW_MAX 0x0f
#define SW_MACHINE_COVER 0x10 /* set = cover closed */
#define SW_MAX 0x10
#define SW_CNT (SW_MAX+1)
/*