Module Name: src Committed By: jmcneill Date: Thu Nov 30 19:42:59 UTC 2017
Modified Files: src/sys/external/gpl2/dts/dist/include/dt-bindings/input: linux-event-codes.h Removed Files: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts: .gitignore src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl: stm32f429-pinfunc.h stm32f746-pinfunc.h stm32h7-pinfunc.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/.gitignore cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f429-pinfunc.h \ src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f746-pinfunc.h \ src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32h7-pinfunc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h diff -u src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h:1.4 src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h:1.5 --- src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h:1.4 Sat Oct 28 10:35:04 2017 +++ src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h Thu Nov 30 19:42:58 2017 @@ -1,5 +1,6 @@ -/* $NetBSD: linux-event-codes.h,v 1.4 2017/10/28 10:35:04 jmcneill Exp $ */ +/* $NetBSD: linux-event-codes.h,v 1.5 2017/11/30 19:42:58 jmcneill Exp $ */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Input event codes * @@ -408,6 +409,7 @@ #define BTN_TOOL_MOUSE 0x146 #define BTN_TOOL_LENS 0x147 #define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */ +#define BTN_STYLUS3 0x149 #define BTN_TOUCH 0x14a #define BTN_STYLUS 0x14b #define BTN_STYLUS2 0x14c