diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:42:14 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:42:14 -0400 |
| commit | 7c27fd19b6d985957424348361afa066ff4c74d8 (patch) | |
| tree | 276063bee8ebb64088e274fd152d0c40e6573372 /include/linux | |
| parent | 336d63b8a3cadc1c678f4b16d6105633c7f6af75 (diff) | |
| parent | 16dd55f309cf69a648ca3b1fc04b3b6f079c8be0 (diff) | |
Merge branch 'sony-laptop' into release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sonypi.h | 8 |
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 @@ | |||
| 103 | #define SONYPI_EVENT_WIRELESS_OFF 61 | 103 | #define SONYPI_EVENT_WIRELESS_OFF 61 |
| 104 | #define SONYPI_EVENT_ZOOM_IN_PRESSED 62 | 104 | #define SONYPI_EVENT_ZOOM_IN_PRESSED 62 |
| 105 | #define SONYPI_EVENT_ZOOM_OUT_PRESSED 63 | 105 | #define SONYPI_EVENT_ZOOM_OUT_PRESSED 63 |
| 106 | #define SONYPI_EVENT_CD_EJECT_PRESSED 64 | ||
| 107 | #define SONYPI_EVENT_MODEKEY_PRESSED 65 | ||
| 108 | #define SONYPI_EVENT_PKEY_P4 66 | ||
| 109 | #define SONYPI_EVENT_PKEY_P5 67 | ||
| 110 | #define SONYPI_EVENT_SETTINGKEY_PRESSED 68 | ||
| 111 | #define SONYPI_EVENT_VOLUME_INC_PRESSED 69 | ||
| 112 | #define SONYPI_EVENT_VOLUME_DEC_PRESSED 70 | ||
| 113 | #define SONYPI_EVENT_BRIGHTNESS_PRESSED 71 | ||
| 106 | 114 | ||
| 107 | /* get/set brightness */ | 115 | /* get/set brightness */ |
| 108 | #define SONYPI_IOCGBRT _IOR('v', 0, __u8) | 116 | #define SONYPI_IOCGBRT _IOR('v', 0, __u8) |