diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-03 01:00:51 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-03 01:00:51 +0100 |
| commit | dbcf75951dec6cbb273f70bb282b101e493f7de3 (patch) | |
| tree | c8107e0915cf42600a61804793a4126392dfad57 /arch/arm/mach-s3c2410 | |
| parent | a8198a15c03ccdd8546f4b626320d08d9803e84b (diff) | |
| parent | 1c52a65040ed7007ed7dbe9bd1e2709996c61890 (diff) | |
Merge branch 'om-gta02-2.6.31' into om-2.6.31
Diffstat (limited to 'arch/arm/mach-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h index 15f0b3e7ce6..0b53cad80fe 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h @@ -20,10 +20,11 @@ * devices that need GPIO. */ -#define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA) +#define ARCH_NR_GPIOS (512 + CONFIG_S3C24XX_GPIO_EXTRA) #include <asm-generic/gpio.h> #include <mach/gpio-nrs.h> #include <mach/gpio-fns.h> +#include <mach/regs-gpioj.h> -#define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32) +#define S3C_GPIO_END (S3C2440_GPIO_BANKJ + 32) |