summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-24 01:17:41 -0500
committerLen Brown <len.brown@intel.com>2009-12-24 01:17:41 -0500
commitfe7fa9c51a76cf67934c2e77dc9d84800c9fbf79 (patch)
treea12638a4069f7af6733a47aff8460040912d9d08 /include/linux
parent6d3bf6818a1d5527f44681d3f763051dfb1930e4 (diff)
parent528809c35faebd8c50a4722c85ab8610725875cc (diff)
downloadlinux-stable-fe7fa9c51a76cf67934c2e77dc9d84800c9fbf79.tar.gz
linux-stable-fe7fa9c51a76cf67934c2e77dc9d84800c9fbf79.tar.bz2
linux-stable-fe7fa9c51a76cf67934c2e77dc9d84800c9fbf79.zip
Merge branch 'sony' into release
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sonypi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
index 34c4475ac4a2..4f95c1aac2fd 100644
--- a/include/linux/sonypi.h
+++ b/include/linux/sonypi.h
@@ -111,6 +111,7 @@
#define SONYPI_EVENT_VOLUME_INC_PRESSED 69
#define SONYPI_EVENT_VOLUME_DEC_PRESSED 70
#define SONYPI_EVENT_BRIGHTNESS_PRESSED 71
+#define SONYPI_EVENT_MEDIA_PRESSED 72
/* get/set brightness */
#define SONYPI_IOCGBRT _IOR('v', 0, __u8)