summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorEric Chen <xinyu.chen@freescale.com>2008-02-29 10:42:55 +0800
committerDaniel Schaeffer <daniel.schaeffer@timesys.com>2008-08-25 15:20:40 -0400
commitd863c570488e46d7262d3644dcc4e54dec030906 (patch)
tree13dbbe8f3030943e4e435887ce1ff62af2088a60 /drivers/input
parentfc908412b9cfcb71e25033276109a2725e73172b (diff)
ENGR00064487 MX31 3DS keypad
keypad change for MX31 3DS board Signed-off-by: Eric Chen <xinyu.chen@freescale.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/mxc_keyb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/mxc_keyb.c b/drivers/input/keyboard/mxc_keyb.c
index 13d37608350f..1cbece6d9fb9 100644
--- a/drivers/input/keyboard/mxc_keyb.c
+++ b/drivers/input/keyboard/mxc_keyb.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -287,7 +287,7 @@ static int mxc_kpp_scan_matrix(void)
* 4. Configure columns as open-drain
*/
reg_val = __raw_readw(KPCR);
- reg_val |= ((1 << MAXCOL) - 1) << 8;
+ reg_val |= ((1 << kpp_dev.kpp_cols) - 1) << 8;
__raw_writew(reg_val, KPCR);
/*