Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge tag 'timer-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

From Kukjin Kim <kgene.kim@samsung.com>:

including fix for GENERIC_GPIO based on previous pull-request for timer-samsung

* tag 'timer-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: change GENERIC_GPIO to ARCH_REQUIRE_GPIOLIB

Signed-off-by: Arnd Bergmann <arnd@anrdb.de>
Arnd Bergmann 12 years ago
parent
0b8467ee39 536504309c
commit
26b2da5ae5
1 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 2 2
      arch/arm/Kconfig

+ 2 - 2
arch/arm/Kconfig
View File 

@@ -770,10 +770,10 @@ config ARCH_SA1100
 
 config ARCH_S3C24XX
 
 	bool "Samsung S3C24XX SoCs"
 
 	select ARCH_HAS_CPUFREQ
 
+	select ARCH_REQUIRE_GPIOLIB
 
 	select CLKDEV_LOOKUP
 
 	select CLKSRC_MMIO
 
 	select GENERIC_CLOCKEVENTS
 
-	select GENERIC_GPIO
 
 	select HAVE_CLK
 
 	select HAVE_S3C2410_I2C if I2C
 
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 
@@ -829,11 +829,11 @@ config ARCH_S5P64X0
 
 
 config ARCH_S5PC100
 
 	bool "Samsung S5PC100"
 
+	select ARCH_REQUIRE_GPIOLIB
 
 	select CLKDEV_LOOKUP
 
 	select CLKSRC_MMIO
 
 	select CPU_V7
 
 	select GENERIC_CLOCKEVENTS
 
-	select GENERIC_GPIO
 
 	select HAVE_CLK
 
 	select HAVE_S3C2410_I2C if I2C
 
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG