clocksource: marco: Rename marco to atlas7

marco project is replaced by atlas7 and we should obliterate
its all traces.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 2fa3853..f6923cf 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -958,7 +958,7 @@ S:  Maintained
 F:     arch/arm/mach-prima2/
 F:     drivers/clk/sirf/
 F:     drivers/clocksource/timer-prima2.c
-F:     drivers/clocksource/timer-marco.c
+F:     drivers/clocksource/timer-atlas7.c
 N:     [^a-z]sirf
 
 ARM/EBSA110 MACHINE SUPPORT

diff --cc drivers/clocksource/Makefile
Simple merge

diff --cc drivers/clocksource/timer-atlas7.c
Simple merge