diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-23 16:12:46 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-23 16:12:46 -1000 |
| commit | e941bc0dd787cd79da3aa7cf1fe0bc1eca6c0b2d (patch) | |
| tree | 83386b43591bd152352c5f967829c89cb9de85da /drivers/input/touchscreen/cyttsp_core.h | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
| parent | be66227151c0cd4da536098c3ee07809101c6faa (diff) | |
| download | linux-e941bc0dd787cd79da3aa7cf1fe0bc1eca6c0b2d.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem updates from Dmitry Torokhov:
"A few small fixups for cyttsp, wacom and xpad drivers"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllers
Input: wacom - add a new stylus (0x100802) for Intuos5 and Cintiqs
Input: add missing dependencies on CONFIG_HAS_IOMEM
Input: cyttsp - fix swapped mfg_stat and mfg_cmd registers
Input: cyttsp - add missing handshake
Input: cyttsp - fix memcpy size param
Diffstat (limited to 'drivers/input/touchscreen/cyttsp_core.h')
| -rw-r--r-- | drivers/input/touchscreen/cyttsp_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/cyttsp_core.h b/drivers/input/touchscreen/cyttsp_core.h index 1aa3c6967e70..f1ebde369f86 100644 --- a/drivers/input/touchscreen/cyttsp_core.h +++ b/drivers/input/touchscreen/cyttsp_core.h @@ -67,8 +67,8 @@ struct cyttsp_xydata { /* TTSP System Information interface definition */ struct cyttsp_sysinfo_data { u8 hst_mode; - u8 mfg_cmd; u8 mfg_stat; + u8 mfg_cmd; u8 cid[3]; u8 tt_undef1; u8 uid[8]; |