summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2416/Kconfig
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-10-04 18:57:43 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-10-04 18:57:43 +0900
commit22be71ea8bf7e9f907e916bf9f6c2bbea9f42553 (patch)
treeedf517ccf09aec82c6a30e69ef885a785fa77167 /arch/arm/mach-s3c2416/Kconfig
parent59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (diff)
parentb391f8cf606679e97b02e3b9dca8a1d9956a5301 (diff)
downloadblackbird-op-linux-22be71ea8bf7e9f907e916bf9f6c2bbea9f42553.tar.gz
blackbird-op-linux-22be71ea8bf7e9f907e916bf9f6c2bbea9f42553.zip
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/mach-s3c2416/Kconfig')
-rw-r--r--arch/arm/mach-s3c2416/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2416/Kconfig b/arch/arm/mach-s3c2416/Kconfig
index 69b48a7d1dbd..84c7b03e5a30 100644
--- a/arch/arm/mach-s3c2416/Kconfig
+++ b/arch/arm/mach-s3c2416/Kconfig
@@ -13,7 +13,6 @@ config CPU_S3C2416
select CPU_ARM926T
select S3C2416_DMA if S3C2410_DMA
select CPU_LLSERIAL_S3C2440
- select S3C_GPIO_PULL_UPDOWN
select SAMSUNG_CLKSRC
select S3C2443_CLOCK
help
OpenPOWER on IntegriCloud