diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 08:24:02 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 08:24:02 -0500 |
| commit | bbba75606963c82febf7bd2761ea848ac5d1a1bb (patch) | |
| tree | 50880b4539c578c407f6c1aa605fddf5e371bb7e /arch/arm/Kconfig | |
| parent | 073154459b80a43f7e4f088b11c93c8e9cb07f14 (diff) | |
| parent | ccbc87693dcb428443a72d644e63484676517c2d (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5711c8160e75..2aef8a5a3661 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -766,6 +766,7 @@ config ARCH_S5PV310 | |||
| 766 | select ARCH_SPARSEMEM_ENABLE | 766 | select ARCH_SPARSEMEM_ENABLE |
| 767 | select GENERIC_GPIO | 767 | select GENERIC_GPIO |
| 768 | select HAVE_CLK | 768 | select HAVE_CLK |
| 769 | select ARCH_HAS_CPUFREQ | ||
| 769 | select GENERIC_CLOCKEVENTS | 770 | select GENERIC_CLOCKEVENTS |
| 770 | select HAVE_S3C_RTC if RTC_CLASS | 771 | select HAVE_S3C_RTC if RTC_CLASS |
| 771 | select HAVE_S3C2410_I2C if I2C | 772 | select HAVE_S3C2410_I2C if I2C |