History

Merge 3.17-rc5 into tty-next

We want those fixes in here as well.

Greg Kroah-Hartman committed 12 years ago

Commit 882ebfc2 parents 1c84cd4 9e82bf0479 files · +5412 −2803Browse files

Showing the changes to include/uapi/linux (2 of 479 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
@@ -240,6 +240,7 @@ header-y += matroxfb.h · 239 unmodified lines
240240 header-y += mdio.h
241241 header-y += media.h
242242 header-y += mei.h
243+header-y += memfd.h
243244 header-y += mempolicy.h
244245 header-y += meye.h
245246 header-y += mic_common.h
@@ -395,6 +396,7 @@ header-y += un.h · 149 unmodified lines
395396 header-y += unistd.h
396397 header-y += unix_diag.h
397398 header-y += usbdevice_fs.h
399+header-y += usbip.h
398400 header-y += utime.h
399401 header-y += utsname.h
400402 header-y += uuid.h
include/uapi/linux/input.h+1−0
@@ -165,6 +165,7 @@ struct input_keymap_entry { · 164 unmodified lines
165165 #define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */
166166 #define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */
167167 #define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */
168+#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */
168169
169170 #define INPUT_PROP_MAX 0x1f
170171 #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)