diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:08 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:08 -0400 |
| commit | ff1b8ba01dc80da338890a187c112fdd3c0b9202 (patch) | |
| tree | 415999aa2c3ac52e48c2b6f690bba393e3d7a00c /arch/arm/mach-s3c2440/Kconfig | |
| parent | 5fcdb16bd04fdeb313ee33bb269b04e59a9abf91 (diff) | |
| parent | 32b6cb3872883861f3a2669cce880f3a7ef8979a (diff) | |
ARM: Merge for-2635/gpio2
Merge branch 'for-2635/gpio2' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c2440/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index a6c5df6d41ef..cd8e7de388f0 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
| @@ -6,6 +6,7 @@ config CPU_S3C2440 | |||
| 6 | bool | 6 | bool |
| 7 | depends on ARCH_S3C2410 | 7 | depends on ARCH_S3C2410 |
| 8 | select CPU_ARM920T | 8 | select CPU_ARM920T |
| 9 | select S3C_GPIO_PULL_UP | ||
| 9 | select S3C2410_CLOCK | 10 | select S3C2410_CLOCK |
| 10 | select S3C2410_PM if PM | 11 | select S3C2410_PM if PM |
| 11 | select S3C2410_GPIO | 12 | select S3C2410_GPIO |