diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-15 23:00:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-15 23:00:48 -0500 |
| commit | d89b8f40fca43cab829fea5c0e7d3951db2fb4bd (patch) | |
| tree | 7f40618ad5df75d0364de99527d362b909f7d62c /drivers/input/mouse/trackpoint.h | |
| parent | 0b60afba5397a3e63264463cde49426d8dcb0de4 (diff) | |
| parent | 02860ab6cd2c71dbe42fa70a65a97823c213635b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/mouse/trackpoint.h')
| -rw-r--r-- | drivers/input/mouse/trackpoint.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h index 9857d8b6ad66..050298b1a09d 100644 --- a/drivers/input/mouse/trackpoint.h +++ b/drivers/input/mouse/trackpoint.h | |||
| @@ -78,7 +78,7 @@ | |||
| 78 | 78 | ||
| 79 | #define TP_TOGGLE_MB 0x23 /* Disable/Enable Middle Button */ | 79 | #define TP_TOGGLE_MB 0x23 /* Disable/Enable Middle Button */ |
| 80 | #define TP_MASK_MB 0x01 | 80 | #define TP_MASK_MB 0x01 |
| 81 | #define TP_TOGGLE_EXT_DEV 0x23 /* Toggle external device */ | 81 | #define TP_TOGGLE_EXT_DEV 0x23 /* Disable external device */ |
| 82 | #define TP_MASK_EXT_DEV 0x02 | 82 | #define TP_MASK_EXT_DEV 0x02 |
| 83 | #define TP_TOGGLE_DRIFT 0x23 /* Drift Correction */ | 83 | #define TP_TOGGLE_DRIFT 0x23 /* Drift Correction */ |
| 84 | #define TP_MASK_DRIFT 0x80 | 84 | #define TP_MASK_DRIFT 0x80 |
| @@ -125,7 +125,7 @@ | |||
| 125 | #define TP_DEF_MB 0x00 | 125 | #define TP_DEF_MB 0x00 |
| 126 | #define TP_DEF_PTSON 0x00 | 126 | #define TP_DEF_PTSON 0x00 |
| 127 | #define TP_DEF_SKIPBACK 0x00 | 127 | #define TP_DEF_SKIPBACK 0x00 |
| 128 | #define TP_DEF_EXT_DEV 0x01 | 128 | #define TP_DEF_EXT_DEV 0x00 /* 0 means enabled */ |
| 129 | 129 | ||
| 130 | #define MAKE_PS2_CMD(params, results, cmd) ((params<<12) | (results<<8) | (cmd)) | 130 | #define MAKE_PS2_CMD(params, results, cmd) ((params<<12) | (results<<8) | (cmd)) |
| 131 | 131 | ||