projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dts-subdirs-for-arm-soc-v3.19' of git://git.kernel.org/pub/scm/linux/kerne...
[cascardo/linux.git]
/
drivers
/
input
/
keyboard
/
stmpe-keypad.c
diff --git
a/drivers/input/keyboard/stmpe-keypad.c
b/drivers/input/keyboard/stmpe-keypad.c
index
c6727dd
..
ef5e67f
100644
(file)
--- a/
drivers/input/keyboard/stmpe-keypad.c
+++ b/
drivers/input/keyboard/stmpe-keypad.c
@@
-86,7
+86,7
@@
static const struct stmpe_keypad_variant stmpe_keypad_variants[] = {
.max_cols = 8,
.max_rows = 12,
.col_gpios = 0x0000ff, /* GPIO 0 - 7*/
- .row_gpios = 0x1f
e
f00, /* GPIO 8-14, 16-20 */
+ .row_gpios = 0x1f
7
f00, /* GPIO 8-14, 16-20 */
},
[STMPE2403] = {
.auto_increment = true,