projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-exynos
/
mct.c
diff --git
a/arch/arm/mach-exynos/mct.c
b/arch/arm/mach-exynos/mct.c
index 57668eb68e751b6b1a3961d989072bd1fbcda323..668d1a6d392d1c887e79f2e15a5156979f5ae225 100644
(file)
--- a/
arch/arm/mach-exynos/mct.c
+++ b/
arch/arm/mach-exynos/mct.c
@@
-22,7
+22,6
@@
#include <linux/of.h>
#include <asm/arch_timer.h>
#include <linux/of.h>
#include <asm/arch_timer.h>
-#include <asm/hardware/gic.h>
#include <asm/localtimer.h>
#include <plat/cpu.h>
#include <asm/localtimer.h>
#include <plat/cpu.h>
@@
-478,7
+477,7
@@
static void __init exynos4_timer_resources(void)
#endif /* CONFIG_LOCAL_TIMERS */
}
#endif /* CONFIG_LOCAL_TIMERS */
}
-
static void __init exynos
_timer_init(void)
+
void __init exynos4
_timer_init(void)
{
if (soc_is_exynos5440()) {
arch_timer_of_register();
{
if (soc_is_exynos5440()) {
arch_timer_of_register();
@@
-494,7
+493,3
@@
static void __init exynos_timer_init(void)
exynos4_clocksource_init();
exynos4_clockevent_init();
}
exynos4_clocksource_init();
exynos4_clockevent_init();
}
-
-struct sys_timer exynos4_timer = {
- .init = exynos_timer_init,
-};