aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2013-04-03 20:04:30 -0400
committerKukjin Kim <kgene.kim@samsung.com>2013-04-03 20:36:24 -0400
commit536504309c3c2da5a755263c7179ffe1b2e5b3dd (patch)
tree97804c27257e76b995b87eb32ec7c33e9a2bcc1b
parentad38bdd15d5b97dcb1ffc46ea77c237e30312fbb (diff)
ARM: SAMSUNG: change GENERIC_GPIO to ARCH_REQUIRE_GPIOLIB
When I applied regarding samsung-time patches, the "select GENERIC_GPIO" has been added wrong, so this patch fixes that. And since the GENERIC_GPIO in arch/arm/ will be gone away, this adds ARCH_REQUIRE_GPIOLIB for S3C24XX and S5PC100 instead. Reported-by: Alexandre Courbot <gnurou@gmail.com> Cc: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 46fcfa8805f8..a239c7ee456f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -770,10 +770,10 @@ config ARCH_SA1100
770config ARCH_S3C24XX 770config ARCH_S3C24XX
771 bool "Samsung S3C24XX SoCs" 771 bool "Samsung S3C24XX SoCs"
772 select ARCH_HAS_CPUFREQ 772 select ARCH_HAS_CPUFREQ
773 select ARCH_REQUIRE_GPIOLIB
773 select CLKDEV_LOOKUP 774 select CLKDEV_LOOKUP
774 select CLKSRC_MMIO 775 select CLKSRC_MMIO
775 select GENERIC_CLOCKEVENTS 776 select GENERIC_CLOCKEVENTS
776 select GENERIC_GPIO
777 select HAVE_CLK 777 select HAVE_CLK
778 select HAVE_S3C2410_I2C if I2C 778 select HAVE_S3C2410_I2C if I2C
779 select HAVE_S3C2410_WATCHDOG if WATCHDOG 779 select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -828,11 +828,11 @@ config ARCH_S5P64X0
828 828
829config ARCH_S5PC100 829config ARCH_S5PC100
830 bool "Samsung S5PC100" 830 bool "Samsung S5PC100"
831 select ARCH_REQUIRE_GPIOLIB
831 select CLKDEV_LOOKUP 832 select CLKDEV_LOOKUP
832 select CLKSRC_MMIO 833 select CLKSRC_MMIO
833 select CPU_V7 834 select CPU_V7
834 select GENERIC_CLOCKEVENTS 835 select GENERIC_CLOCKEVENTS
835 select GENERIC_GPIO
836 select HAVE_CLK 836 select HAVE_CLK
837 select HAVE_S3C2410_I2C if I2C 837 select HAVE_S3C2410_I2C if I2C
838 select HAVE_S3C2410_WATCHDOG if WATCHDOG 838 select HAVE_S3C2410_WATCHDOG if WATCHDOG