git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for-2.6.35
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
include
/
mach
/
gpio.h
diff --git
a/arch/arm/mach-s3c2410/include/mach/gpio.h
b/arch/arm/mach-s3c2410/include/mach/gpio.h
index
15f0b3e
..
b649bf2
100644
(file)
--- a/
arch/arm/mach-s3c2410/include/mach/gpio.h
+++ b/
arch/arm/mach-s3c2410/include/mach/gpio.h
@@
-20,10
+20,18
@@
* devices that need GPIO.
*/
* 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)
#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>
#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)
#define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32)
+#endif