From: Rakesh Iyer <riyer@nvidia.com>
Date: Mon, 23 Jan 2012 07:27:54 +0000 (-0800)
Subject: Input: tegra-kbc - remove pre-Tegra20 definitions
X-Git-Tag: v3.4-rc1~130^2^2~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=82f6aba8eacf9dec23459832c1a0c789db28faa3;p=karo-tx-linux.git

Input: tegra-kbc - remove pre-Tegra20 definitions

Add support for Tegra30 by correcting definitions. This is necessary to
make driver useful in Tegra30.

Signed-off-by: Rakesh Iyer <riyer@nvidia.com>
Acked-by: Stephen Warren: <swarren@nvidia.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/arch/arm/mach-tegra/include/mach/kbc.h b/arch/arm/mach-tegra/include/mach/kbc.h
index 20bb0545f992..d34ecd1bea63 100644
--- a/arch/arm/mach-tegra/include/mach/kbc.h
+++ b/arch/arm/mach-tegra/include/mach/kbc.h
@@ -24,13 +24,8 @@
 #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