diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-20 07:05:39 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-20 07:05:39 +0100 |
| commit | 2d9f0d964be94fd51c7303288c6f9c88bf2381fe (patch) | |
| tree | 2631c3e82abc145a6e9c8e2c18687833c71de012 /drivers/input/mouse/psmouse.h | |
| parent | Input: wacom - fix wacom_set_report retry logic (diff) | |
| parent | Input: cyttsp-spi - remove duplicate MODULE_ALIAS() (diff) | |
| download | linux-2d9f0d964be94fd51c7303288c6f9c88bf2381fe.tar.xz linux-2d9f0d964be94fd51c7303288c6f9c88bf2381fe.zip | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.9 merge window.
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 fe1df231ba4c..2f0b39d59a9b 100644 --- a/drivers/input/mouse/psmouse.h +++ b/drivers/input/mouse/psmouse.h @@ -95,6 +95,7 @@ enum psmouse_type { PSMOUSE_ELANTECH, PSMOUSE_FSP, PSMOUSE_SYNAPTICS_RELATIVE, + PSMOUSE_CYPRESS, PSMOUSE_AUTO /* This one should always be last */ }; |