History

Merge tag 'v3.17-rc5' into next

Linux 3.17-rc5 Signed-off-by: Felipe Balbi <balbi@ti.com>

Felipe Balbi committed 12 years ago

Commit 4cd41ff2 parents d915216 9e82bf0331 files · +3961 −2087Browse files

Showing the changes to include/uapi/linux (2 of 331 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
240header-y += mdio.h240header-y += mdio.h
241header-y += media.h241header-y += media.h
242header-y += mei.h242header-y += mei.h
243header-y += memfd.h
243header-y += mempolicy.h244header-y += mempolicy.h
244header-y += meye.h245header-y += meye.h
245header-y += mic_common.h246header-y += mic_common.h
@@ -395,6 +396,7 @@ header-y += un.h · 149 unmodified lines
395header-y += unistd.h396header-y += unistd.h
396header-y += unix_diag.h397header-y += unix_diag.h
397header-y += usbdevice_fs.h398header-y += usbdevice_fs.h
399header-y += usbip.h
398header-y += utime.h400header-y += utime.h
399header-y += utsname.h401header-y += utsname.h
400header-y += uuid.h402header-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)