diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-09 04:05:30 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-09 04:05:30 -0400 |
| commit | 664cee46e755b37204f1731cb8726db610f3486d (patch) | |
| tree | 11ed0d43eff14123534785cf25c0a2143e134e7e /include/linux/sonypi.h | |
| parent | a0334c50bf0ba7c720ed00f931e721c989efd233 (diff) | |
| parent | 4e29402fe4b2006c994eed5020c42b2cc87d9b42 (diff) | |
Merge branch 'fix/asoc' into for-linus
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 0e6dc3891942..c0f87da78f8a 100644 --- a/include/linux/sonypi.h +++ b/include/linux/sonypi.h | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | 40 | ||
| 41 | /* events the user application reading /dev/sonypi can use */ | 41 | /* events the user application reading /dev/sonypi can use */ |
| 42 | 42 | ||
| 43 | #define SONYPI_EVENT_IGNORE 0 | ||
| 43 | #define SONYPI_EVENT_JOGDIAL_DOWN 1 | 44 | #define SONYPI_EVENT_JOGDIAL_DOWN 1 |
| 44 | #define SONYPI_EVENT_JOGDIAL_UP 2 | 45 | #define SONYPI_EVENT_JOGDIAL_UP 2 |
| 45 | #define SONYPI_EVENT_JOGDIAL_DOWN_PRESSED 3 | 46 | #define SONYPI_EVENT_JOGDIAL_DOWN_PRESSED 3 |