diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 16:40:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 16:40:59 -0700 |
commit | 3d6eadcb5008beca1b289983ffd7771d1e947bac (patch) | |
tree | 2a765d732c67173d323e903da67db12282ad597a /drivers/input/mouse/psmouse.h | |
parent | a483ab1dddf86a0e8924e94cf838eed602602b39 (diff) | |
parent | 2a0bd75e5e687a9c34921e942c18477ea7ec2d63 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: psmouse - add support for Elantech touchpads
Input: i8042 - add Blue FB5601 to noloop exception table
Diffstat (limited to 'drivers/input/mouse/psmouse.h')
-rw-r--r-- | drivers/input/mouse/psmouse.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h index 8b608a1cdd1..54ed267894b 100644 --- a/drivers/input/mouse/psmouse.h +++ b/drivers/input/mouse/psmouse.h @@ -90,6 +90,7 @@ enum psmouse_type { PSMOUSE_TOUCHKIT_PS2, PSMOUSE_CORTRON, PSMOUSE_HGPK, + PSMOUSE_ELANTECH, PSMOUSE_AUTO /* This one should always be last */ }; |