aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/Kconfig
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-19 18:04:08 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-19 18:04:08 +0900
commitff1b8ba01dc80da338890a187c112fdd3c0b9202 (patch)
tree415999aa2c3ac52e48c2b6f690bba393e3d7a00c /arch/arm/mach-s3c2410/Kconfig
parent5fcdb16bd04fdeb313ee33bb269b04e59a9abf91 (diff)
parent32b6cb3872883861f3a2669cce880f3a7ef8979a (diff)
downloadkernel_samsung_smdk4412-ff1b8ba01dc80da338890a187c112fdd3c0b9202.zip
kernel_samsung_smdk4412-ff1b8ba01dc80da338890a187c112fdd3c0b9202.tar.gz
kernel_samsung_smdk4412-ff1b8ba01dc80da338890a187c112fdd3c0b9202.tar.bz2
ARM: Merge for-2635/gpio2
Merge branch 'for-2635/gpio2' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c2410/Kconfig')
-rw-r--r--arch/arm/mach-s3c2410/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 163b60e..a4c0b3f 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -6,6 +6,7 @@ config CPU_S3C2410
bool
depends on ARCH_S3C2410
select CPU_ARM920T
+ select S3C_GPIO_PULL_UP
select S3C2410_CLOCK
select S3C2410_GPIO
select CPU_LLSERIAL_S3C2410