diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-15 19:56:50 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-15 19:57:24 +0100 |
| commit | 2ea0dde7653342d363144b17cb39932e27428e9a (patch) | |
| tree | b4316bb625ef7f216713e0f1221bdfff8a113379 /arch | |
| parent | Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff) | |
| parent | timer: vt8500: Convert vt8500 to use CLKSRC_OF (diff) | |
| download | linux-2ea0dde7653342d363144b17cb39932e27428e9a.tar.xz linux-2ea0dde7653342d363144b17cb39932e27428e9a.zip | |
Merge branch 'vt8500/timer' into next/cleanup
* vt8500/timer:
timer: vt8500: Convert vt8500 to use CLKSRC_OF
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-vt8500/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-vt8500/vt8500.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig index 570a801fb862..d1cbda66dc9c 100644 --- a/arch/arm/mach-vt8500/Kconfig +++ b/arch/arm/mach-vt8500/Kconfig @@ -4,6 +4,7 @@ config ARCH_VT8500 select ARCH_HAS_CPUFREQ select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP + select CLKSRC_OF select CPU_ARM926T select GENERIC_CLOCKEVENTS select GENERIC_GPIO diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c index b9fd9d3cbfb3..fe99b709f11f 100644 --- a/arch/arm/mach-vt8500/vt8500.c +++ b/arch/arm/mach-vt8500/vt8500.c @@ -18,9 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <linux/clocksource.h> #include <linux/io.h> #include <linux/pm.h> -#include <linux/vt8500_timer.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -186,8 +186,8 @@ DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)") .dt_compat = vt8500_dt_compat, .map_io = vt8500_map_io, .init_irq = vt8500_init_irq, - .init_time = vt8500_timer_init, .init_machine = vt8500_init, + .init_time = clocksource_of_init, .restart = vt8500_restart, .handle_irq = vt8500_handle_irq, MACHINE_END |