Merge branch 'sony' into release

2009-12-24 01:17:41 -05:00
parent 6d3bf6818a 528809c35f
commit fe7fa9c51a
2 changed files with 72 additions and 23 deletions
--- 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)