diff options
| author | James Morris <jmorris@namei.org> | 2011-03-07 18:55:06 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-07 18:55:06 -0500 |
| commit | 1cc26bada9f6807814806db2f0d78792eecdac71 (patch) | |
| tree | 5509b5139db04af6c13db0a580c84116a4a54039 /include/linux/sonypi.h | |
| parent | eae61f3c829439f8f9121b5cd48a14be04df451f (diff) | |
| parent | 214d93b02c4fe93638ad268613c9702a81ed9192 (diff) | |
Merge branch 'master'; commit 'v2.6.38-rc7' into next
Diffstat (limited to 'include/linux/sonypi.h')
| -rw-r--r-- | include/linux/sonypi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h index 4f95c1aac2fd..0e6dc3891942 100644 --- a/include/linux/sonypi.h +++ b/include/linux/sonypi.h | |||
| @@ -112,6 +112,7 @@ | |||
| 112 | #define SONYPI_EVENT_VOLUME_DEC_PRESSED 70 | 112 | #define SONYPI_EVENT_VOLUME_DEC_PRESSED 70 |
| 113 | #define SONYPI_EVENT_BRIGHTNESS_PRESSED 71 | 113 | #define SONYPI_EVENT_BRIGHTNESS_PRESSED 71 |
| 114 | #define SONYPI_EVENT_MEDIA_PRESSED 72 | 114 | #define SONYPI_EVENT_MEDIA_PRESSED 72 |
| 115 | #define SONYPI_EVENT_VENDOR_PRESSED 73 | ||
| 115 | 116 | ||
| 116 | /* get/set brightness */ | 117 | /* get/set brightness */ |
| 117 | #define SONYPI_IOCGBRT _IOR('v', 0, __u8) | 118 | #define SONYPI_IOCGBRT _IOR('v', 0, __u8) |