Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[linux-2.6-block.git] / arch / arm / mach-s3c24xx / Kconfig

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 8f1d327e0cd1566286a5f6530569dbf1bc530ca4..d876431d64c09c7d3f0ad1025a425e8d757a81be 100644 (file)
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -180,27 +180,6 @@ config CPU_LLSERIAL_S3C2440
          Selected if there is an S3C2440 (or register compatible) serial
          low-level implementation needed
 
-# gpio configurations
-
-config S3C24XX_GPIO_EXTRA
-       int
-       default 128 if S3C24XX_GPIO_EXTRA128
-       default 64 if S3C24XX_GPIO_EXTRA64
-       default 16 if ARCH_H1940
-       default 0
-
-config S3C24XX_GPIO_EXTRA64
-       bool
-       help
-         Add an extra 64 gpio numbers to the available GPIO pool. This is
-         available for boards that need extra gpios for external devices.
-
-config S3C24XX_GPIO_EXTRA128
-       bool
-       help
-         Add an extra 128 gpio numbers to the available GPIO pool. This is
-         available for boards that need extra gpios for external devices.
-
 config S3C24XX_PLL
        bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
        depends on ARM_S3C24XX_CPUFREQ