Merge branch 'next' into for-linus

[pandora-kernel.git] / include / linux / input / matrix_keypad.h

diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h
index b67feb8..fe7c4b9 100644 (file)
--- 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)