From 23a84c08838e8efac1447691f7c686fa692b3858 Mon Sep 17 00:00:00 2001
From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Wed, 12 May 2010 10:22:41 +0300
Subject: [PATCH] --- yaml --- r: 191999 b: refs/heads/master c:
 a0026418d3d99b68dbd6c91f277d6f764fe41956 h: refs/heads/master i:   191997:
 6fe3a87b9f797f42bcdd1d5ca9a25504f9ebb1c5   191995:
 346934aa996f8f9df676676608b913c448023659   191991:
 0e1745adf28afed95dfe1ff2013a2470f78b24ad   191983:
 2c0e54e2154792cbfd61708eba0f05578812ec7b   191967:
 b04c71293ba22846a95b2ef85c369f31fe42aa2b   191935:
 011b7b04fcdd4ee64a5ae9971026c477422a691e   191871:
 e8a77f4fc0b6c5c59f78c4c728e0560cfdcb12d4   191743:
 9900681ac1ec3defe10e3c944e7de7c9608b10b3   191487:
 07350f18ae3a56e2165648f8a750da09e202769b v: v3

---
 [refs]                                                | 2 +-
 trunk/arch/arm/mach-s3c2410/include/mach/gpio-track.h | 2 +-
 trunk/arch/arm/mach-s3c2410/include/mach/gpio.h       | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1b838e689ccc..0623681eb442 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcef85c0c122f90f57f2f3ef0caeaf6404d6e8f3
+refs/heads/master: a0026418d3d99b68dbd6c91f277d6f764fe41956
diff --git a/trunk/arch/arm/mach-s3c2410/include/mach/gpio-track.h b/trunk/arch/arm/mach-s3c2410/include/mach/gpio-track.h
index acb259103808..6371eaa5fe4d 100644
--- a/trunk/arch/arm/mach-s3c2410/include/mach/gpio-track.h
+++ b/trunk/arch/arm/mach-s3c2410/include/mach/gpio-track.h
@@ -23,7 +23,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)
 {
 	struct s3c_gpio_chip *chip;
 
-	if (pin > S3C2410_GPG(10))
+	if (pin > S3C_GPIO_END)
 		return NULL;
 
 	chip = &s3c24xx_gpios[pin/32];
diff --git a/trunk/arch/arm/mach-s3c2410/include/mach/gpio.h b/trunk/arch/arm/mach-s3c2410/include/mach/gpio.h
index 15f0b3e7ce69..b649bf2ccd5c 100644
--- a/trunk/arch/arm/mach-s3c2410/include/mach/gpio.h
+++ b/trunk/arch/arm/mach-s3c2410/include/mach/gpio.h
@@ -20,10 +20,18 @@
  * devices that need GPIO.
  */
 
+#ifdef CONFIG_CPU_S3C244X
+#define ARCH_NR_GPIOS	(32 * 9 + CONFIG_S3C24XX_GPIO_EXTRA)
+#else
 #define ARCH_NR_GPIOS	(256 + CONFIG_S3C24XX_GPIO_EXTRA)
+#endif
 
 #include <asm-generic/gpio.h>
 #include <mach/gpio-nrs.h>
 #include <mach/gpio-fns.h>
 
+#ifdef CONFIG_CPU_S3C24XX
+#define S3C_GPIO_END	(S3C2410_GPIO_BANKJ + 32)
+#else
 #define S3C_GPIO_END	(S3C2410_GPIO_BANKH + 32)
+#endif