diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-14 14:13:40 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-14 14:13:48 -0800 |
| commit | 175dbc1eeadbdcf5f04d3a61fdc0ede4335c45c8 (patch) | |
| tree | 54f5738913273d633db83c0ab73539c2c24b1685 /arch/arm/mach-vt8500/Makefile | |
| parent | 8d84981e395850aab31c3f2ca7e2738e03f671d7 (diff) | |
| parent | ff7ec345f0ece9ddbb28538b70ba0c7f0acc17dc (diff) | |
Merge tag 'vt8500/timer' of git://server.prisktech.co.nz/git/linuxwmt into next/cleanup
From Tony Prisk:
Move arch-vt8500/timer.c to drivers/clocksource/vt8500-timer.c
* tag 'vt8500/timer' of git://server.prisktech.co.nz/git/linuxwmt:
timer: vt8500: Move timer code to drivers/clocksource
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-vt8500/Makefile')
| -rw-r--r-- | arch/arm/mach-vt8500/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vt8500/Makefile b/arch/arm/mach-vt8500/Makefile index e035251cda4..92ceb2436b6 100644 --- a/arch/arm/mach-vt8500/Makefile +++ b/arch/arm/mach-vt8500/Makefile @@ -1 +1 @@ -obj-$(CONFIG_ARCH_VT8500) += irq.o timer.o vt8500.o +obj-$(CONFIG_ARCH_VT8500) += irq.o vt8500.o |