1 files changed, 7 insertions, 6 deletions

diff --git a/arch/arm/mach-tegra/include/mach/kbc.h b/arch/arm/mach-tegra/include/mach/kbc.h
index 20bb0545f992..a13025612939 100644
--- a/arch/arm/mach-tegra/include/mach/kbc.h
+++ b/arch/arm/mach-tegra/include/mach/kbc.h
@@ -24,20 +24,21 @@
 #include <linux/types.h>
 #include <linux/input/matrix_keypad.h>
 
-#ifdef CONFIG_ARCH_TEGRA_2x_SOC
 #define KBC_MAX_GPIO    24
 #define KBC_MAX_KPENT   8
-#else
-#define KBC_MAX_GPIO    20
-#define KBC_MAX_KPENT   7
-#endif
 
 #define KBC_MAX_ROW     16
 #define KBC_MAX_COL     8
 #define KBC_MAX_KEY     (KBC_MAX_ROW * KBC_MAX_COL)
 
+enum tegra_pin_type {
+        PIN_CFG_IGNORE,
+        PIN_CFG_COL,
+        PIN_CFG_ROW,
+};
+
 struct tegra_kbc_pin_cfg {
-        bool is_row;
+        enum tegra_pin_type type;
         unsigned char num;
 };