diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:47:38 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:47:38 -0400 |
| commit | 26b2da5ae5041e4a6d11a3d9cb1d1097c447d90d (patch) | |
| tree | c61db4d43d0ecd4866e079cff4fdffe6e9758345 /arch/arm/Kconfig | |
| parent | 0b8467ee39721340450482e87471ca4c0d6170f3 (diff) | |
| parent | 536504309c3c2da5a755263c7179ffe1b2e5b3dd (diff) | |
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>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1dc16e539808..ccb6c0c71521 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -770,10 +770,10 @@ config ARCH_SA1100 | |||
| 770 | config ARCH_S3C24XX | 770 | config 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 |
| @@ -829,11 +829,11 @@ config ARCH_S5P64X0 | |||
| 829 | 829 | ||
| 830 | config ARCH_S5PC100 | 830 | config ARCH_S5PC100 |
| 831 | bool "Samsung S5PC100" | 831 | bool "Samsung S5PC100" |
| 832 | select ARCH_REQUIRE_GPIOLIB | ||
| 832 | select CLKDEV_LOOKUP | 833 | select CLKDEV_LOOKUP |
| 833 | select CLKSRC_MMIO | 834 | select CLKSRC_MMIO |
| 834 | select CPU_V7 | 835 | select CPU_V7 |
| 835 | select GENERIC_CLOCKEVENTS | 836 | select GENERIC_CLOCKEVENTS |
| 836 | select GENERIC_GPIO | ||
| 837 | select HAVE_CLK | 837 | select HAVE_CLK |
| 838 | select HAVE_S3C2410_I2C if I2C | 838 | select HAVE_S3C2410_I2C if I2C |
| 839 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 839 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |