History

Merge branch 'for-linus' into next

Sync up with 'for-linus' branch to resolve conflict in Elan touchpad driver.

Dmitry Torokhov committed 6 years ago

Commit a5c33d52 parents 9b031c8 a50ca299 files · +32 −11Browse files

Showing the changes to include/uapi (1 of 9 files). Show all

Unified · Split

include/uapi/linux/input-event-codes.h+2−1
@@ -888,7 +888,8 @@ · 887 unmodified lines
888#define SW_LINEIN_INSERT 0x0d /* set = inserted */888#define SW_LINEIN_INSERT 0x0d /* set = inserted */
889#define SW_MUTE_DEVICE 0x0e /* set = device disabled */889#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
890#define SW_PEN_INSERTED 0x0f /* set = pen inserted */890#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
891#define SW_MAX 0x0f891#define SW_MACHINE_COVER 0x10 /* set = cover closed */
892#define SW_MAX 0x10
892#define SW_CNT (SW_MAX+1)893#define SW_CNT (SW_MAX+1)
893 894
894/*895/*