diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-07 03:23:44 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-07 03:23:44 (GMT) |
| commit | 07176b988ebb20f46a317a60ee1d983fe1630203 (patch) | |
| tree | e54affb1f823742078c68d9506e6035016bc2ea4 /drivers/input/serio/i8042.h | |
| parent | fa46c7984092f3dbdbb3bcd7338d81a1168d9d2b (diff) | |
| parent | 52764fed5049655926bcecaefd52f0a415ceb105 (diff) | |
| download | linux-fsl-qoriq-07176b988ebb20f46a317a60ee1d983fe1630203.tar.xz | |
Merge branch 'next' into for-linus
Merge first round of changes for 3.12 merge window.
Diffstat (limited to 'drivers/input/serio/i8042.h')
| -rw-r--r-- | drivers/input/serio/i8042.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h index 3452708..fc080be 100644 --- a/drivers/input/serio/i8042.h +++ b/drivers/input/serio/i8042.h @@ -41,30 +41,6 @@ #define I8042_CTL_TIMEOUT 10000 /* - * Status register bits. - */ - -#define I8042_STR_PARITY 0x80 -#define I8042_STR_TIMEOUT 0x40 -#define I8042_STR_AUXDATA 0x20 -#define I8042_STR_KEYLOCK 0x10 -#define I8042_STR_CMDDAT 0x08 -#define I8042_STR_MUXERR 0x04 -#define I8042_STR_IBF 0x02 -#define I8042_STR_OBF 0x01 - -/* - * Control register bits. - */ - -#define I8042_CTR_KBDINT 0x01 -#define I8042_CTR_AUXINT 0x02 -#define I8042_CTR_IGNKEYLOCK 0x08 -#define I8042_CTR_KBDDIS 0x10 -#define I8042_CTR_AUXDIS 0x20 -#define I8042_CTR_XLATE 0x40 - -/* * Return codes. */ |