History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes.

David S. Miller committed 12 years ago

Commit 1f6d8032 parents a2aeb02 98f75b8467 files · +4648 −2442Browse files

Showing the changes to include/uapi/linux (2 of 467 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/Kbuild +2 −0
  2. include/uapi/linux/input.h +1 −0
include/uapi/linux/Kbuild+2−0
@@ -241,6 +241,7 @@ header-y += matroxfb.h · 240 unmodified lines
241header-y += mdio.h241header-y += mdio.h
242header-y += media.h242header-y += media.h
243header-y += mei.h243header-y += mei.h
244header-y += memfd.h
244header-y += mempolicy.h245header-y += mempolicy.h
245header-y += meye.h246header-y += meye.h
246header-y += mic_common.h247header-y += mic_common.h
@@ -396,6 +397,7 @@ header-y += un.h · 149 unmodified lines
396header-y += unistd.h397header-y += unistd.h
397header-y += unix_diag.h398header-y += unix_diag.h
398header-y += usbdevice_fs.h399header-y += usbdevice_fs.h
400header-y += usbip.h
399header-y += utime.h401header-y += utime.h
400header-y += utsname.h402header-y += utsname.h
401header-y += uuid.h403header-y += uuid.h
include/uapi/linux/input.h+1−0
@@ -165,6 +165,7 @@ struct input_keymap_entry { · 164 unmodified lines
165#define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */165#define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */
166#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */166#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */
167#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */167#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */
168#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */
168 169
169#define INPUT_PROP_MAX 0x1f170#define INPUT_PROP_MAX 0x1f
170#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)171#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)