diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 07:38:46 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 07:38:46 -0500 |
| commit | 7169ff4a0942adf524f25713eaed30599d438926 (patch) | |
| tree | 08e7077a48d2d5acd4008fec28a913e1d6ee29ee /arch/arm/Kconfig | |
| parent | e135e4506c6d3e9b196890877a9a2815f71b04ac (diff) | |
| parent | 4128e27584f58bce9f56a9a0346650c94a651332 (diff) | |
Merge branch 'rtc-sa1100' of git://github.com/hzhuang1/linux into next/drivers
* 'rtc-sa1100' of git://github.com/hzhuang1/linux:
ARM: mmp: enable rtc in pxa910
rtc: sa1100: enable clk support
ARM: pxa: add rtc dummy clock
ARM: sa1100: clean up clock support
rtc: sa1100: declare irq in resource
rtc: sa1100: remove verification code of alarm
rtc: sa1100: remove periodic code
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 92c9c79c140c..baf6dc6e9a1b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -754,7 +754,7 @@ config ARCH_SA1100 | |||
| 754 | select ARCH_HAS_CPUFREQ | 754 | select ARCH_HAS_CPUFREQ |
| 755 | select CPU_FREQ | 755 | select CPU_FREQ |
| 756 | select GENERIC_CLOCKEVENTS | 756 | select GENERIC_CLOCKEVENTS |
| 757 | select HAVE_CLK | 757 | select CLKDEV_LOOKUP |
| 758 | select HAVE_SCHED_CLOCK | 758 | select HAVE_SCHED_CLOCK |
| 759 | select TICK_ONESHOT | 759 | select TICK_ONESHOT |
| 760 | select ARCH_REQUIRE_GPIOLIB | 760 | select ARCH_REQUIRE_GPIOLIB |