diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 15:18:36 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 15:18:36 +0400 |
| commit | db3c94a7edc6b29f8d52ba5884dec6a15feeadad (patch) | |
| tree | ac9207a44cecafb9104ca4e1f46aecb9fe01383d /arch/arm/mach-s3c2440/Kconfig | |
| parent | c9477f38cba225870862fd9e08868ae3d4abdfe0 (diff) | |
| parent | 568f0e278c6dd33dc11bd19c4ad781d1f8d86800 (diff) | |
| download | linux-db3c94a7edc6b29f8d52ba5884dec6a15feeadad.tar.xz | |
Merge branch 'next-samsung-devel' into next-samsung-devel-2
Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s3c2412/gpio.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/gpiolib.c
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 c461fb8e15c0..914e620f1257 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -5,7 +5,6 @@ config CPU_S3C2440 bool select CPU_ARM920T - select S3C_GPIO_PULL_UP select S3C2410_CLOCK select S3C2410_PM if PM select S3C2440_DMA if S3C2410_DMA @@ -17,7 +16,6 @@ config CPU_S3C2440 config CPU_S3C2442 bool select CPU_ARM920T - select S3C_GPIO_PULL_DOWN select S3C2410_CLOCK select S3C2410_PM if PM select CPU_S3C244X |