summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-05 01:42:14 -0400
committerLen Brown <len.brown@intel.com>2009-04-05 01:42:14 -0400
commit7c27fd19b6d985957424348361afa066ff4c74d8 (patch)
tree276063bee8ebb64088e274fd152d0c40e6573372 /include
parent336d63b8a3cadc1c678f4b16d6105633c7f6af75 (diff)
parent16dd55f309cf69a648ca3b1fc04b3b6f079c8be0 (diff)
downloadlinux-7c27fd19b6d985957424348361afa066ff4c74d8.tar.gz
linux-7c27fd19b6d985957424348361afa066ff4c74d8.tar.bz2
linux-7c27fd19b6d985957424348361afa066ff4c74d8.zip
Merge branch 'sony-laptop' into release
Diffstat (limited to 'include')
-rw-r--r--include/linux/sonypi.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
index f41ffd7c2dd9..34c4475ac4a2 100644
--- a/include/linux/sonypi.h
+++ b/include/linux/sonypi.h
@@ -103,6 +103,14 @@
#define SONYPI_EVENT_WIRELESS_OFF 61
#define SONYPI_EVENT_ZOOM_IN_PRESSED 62
#define SONYPI_EVENT_ZOOM_OUT_PRESSED 63
+#define SONYPI_EVENT_CD_EJECT_PRESSED 64
+#define SONYPI_EVENT_MODEKEY_PRESSED 65
+#define SONYPI_EVENT_PKEY_P4 66
+#define SONYPI_EVENT_PKEY_P5 67
+#define SONYPI_EVENT_SETTINGKEY_PRESSED 68
+#define SONYPI_EVENT_VOLUME_INC_PRESSED 69
+#define SONYPI_EVENT_VOLUME_DEC_PRESSED 70
+#define SONYPI_EVENT_BRIGHTNESS_PRESSED 71
/* get/set brightness */
#define SONYPI_IOCGBRT _IOR('v', 0, __u8)