diff options
| author | Simon Horman | 2011-01-13 02:29:21 +0100 |
|---|---|---|
| committer | Simon Horman | 2011-01-13 02:29:21 +0100 |
| commit | fee1cc0895fd7bde875a86bbc3a1e82089e540b8 (patch) | |
| tree | df0a07a650229fd7aa775ca6c20a8d2939c96e72 /include/linux/input/matrix_keypad.h | |
| parent | netfilter: fix compilation when conntrack is disabled but tproxy is enabled (diff) | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/... (diff) | |
| download | kernel-qcow2-linux-fee1cc0895fd7bde875a86bbc3a1e82089e540b8.tar.gz kernel-qcow2-linux-fee1cc0895fd7bde875a86bbc3a1e82089e540b8.tar.xz kernel-qcow2-linux-fee1cc0895fd7bde875a86bbc3a1e82089e540b8.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD
Diffstat (limited to 'include/linux/input/matrix_keypad.h')
| -rw-r--r-- | include/linux/input/matrix_keypad.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h index 80352ad6581a..697474691749 100644 --- a/include/linux/input/matrix_keypad.h +++ b/include/linux/input/matrix_keypad.h @@ -9,7 +9,7 @@ #define KEY(row, col, val) ((((row) & (MATRIX_MAX_ROWS - 1)) << 24) |\ (((col) & (MATRIX_MAX_COLS - 1)) << 16) |\ - (val & 0xffff)) + ((val) & 0xffff)) #define KEY_ROW(k) (((k) >> 24) & 0xff) #define KEY_COL(k) (((k) >> 16) & 0xff) |