diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-10-29 19:46:49 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-10-29 19:46:49 -0400 |
| commit | 7c1552d196682f05abaa8e49f81c40a9b6459b67 (patch) | |
| tree | c052789b883435159c22708058e1ced9c0597113 /arch/arm/plat-s3c24xx | |
| parent | 8f08bfd4777a2953d18db756938d90a5b532eb1a (diff) | |
| parent | 68730b451b7d44a9e85b76aac2d8c1aa751d38a4 (diff) | |
ARM: Merge for-2637/s3c24xx/h1940
Diffstat (limited to 'arch/arm/plat-s3c24xx')
| -rw-r--r-- | arch/arm/plat-s3c24xx/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig index 984bf66826d2..5a27b1b538f2 100644 --- a/arch/arm/plat-s3c24xx/Kconfig +++ b/arch/arm/plat-s3c24xx/Kconfig | |||
| @@ -69,6 +69,7 @@ config S3C24XX_GPIO_EXTRA | |||
| 69 | int | 69 | int |
| 70 | default 128 if S3C24XX_GPIO_EXTRA128 | 70 | default 128 if S3C24XX_GPIO_EXTRA128 |
| 71 | default 64 if S3C24XX_GPIO_EXTRA64 | 71 | default 64 if S3C24XX_GPIO_EXTRA64 |
| 72 | default 16 if ARCH_H1940 | ||
| 72 | default 0 | 73 | default 0 |
| 73 | 74 | ||
| 74 | config S3C24XX_GPIO_EXTRA64 | 75 | config S3C24XX_GPIO_EXTRA64 |