aboutsummaryrefslogtreecommitdiff
path: root/include/uapi/linux/input.h
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-09 11:37:00 +0000
committerMark Brown <broonie@linaro.org>2013-12-09 11:37:00 +0000
commiteed4bafd63b5584adb832a582a931ecba41dec55 (patch)
tree5855807caaf53aec80037b2635eb2e2c0744565b /include/uapi/linux/input.h
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff)
parent2c06cb20454795a38876be5bd93dd6a8ddcc9d98 (diff)
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aosp
Diffstat (limited to 'include/uapi/linux/input.h')
-rw-r--r--include/uapi/linux/input.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index 4649ee35b60..93a956489e8 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -153,6 +153,9 @@ struct input_keymap_entry {
#define EVIOCGRAB _IOW('E', 0x90, int) /* Grab/Release device */
+#define EVIOCGSUSPENDBLOCK _IOR('E', 0x91, int) /* get suspend block enable */
+#define EVIOCSSUSPENDBLOCK _IOW('E', 0x91, int) /* set suspend block enable */
+
#define EVIOCSCLOCKID _IOW('E', 0xa0, int) /* Set clockid to be used for timestamps */
/*