diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:14:06 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:14:06 +0900 |
commit | c37b25046289e857918d25fd96aa441ea7929ad5 (patch) | |
tree | 2241c0b30738d26758dbe481605a962952e75024 /arch/arm/mach-s3c2440/Kconfig | |
parent | a102a9ece5489e1718cd7543aa079082450ac3a2 (diff) | |
parent | 4c59de052e7167a3bcf3f32c5ea4c9a5ef07386a (diff) |
Merge branch 'next-samsung-cleanup' into next-samsung-devel-2
Diffstat (limited to 'arch/arm/mach-s3c2440/Kconfig')
-rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 50825a3f91c..c461fb8e15c 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -8,7 +8,6 @@ config CPU_S3C2440 select S3C_GPIO_PULL_UP select S3C2410_CLOCK select S3C2410_PM if PM - select S3C2410_GPIO select S3C2440_DMA if S3C2410_DMA select CPU_S3C244X select CPU_LLSERIAL_S3C2440 @@ -20,7 +19,6 @@ config CPU_S3C2442 select CPU_ARM920T select S3C_GPIO_PULL_DOWN select S3C2410_CLOCK - select S3C2410_GPIO select S3C2410_PM if PM select CPU_S3C244X select CPU_LLSERIAL_S3C2440 |