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-spear3xx
/
spear3xx.c
diff --git
a/arch/arm/mach-spear3xx/spear3xx.c
b/arch/arm/mach-spear3xx/spear3xx.c
index c6003ef0c9f6688c0d29a2931052eab2e055854a..b2ba516ca2d4ee4a46e8eb9a4a328bebb09aa3dd 100644
(file)
--- a/
arch/arm/mach-spear3xx/spear3xx.c
+++ b/
arch/arm/mach-spear3xx/spear3xx.c
@@
-84,7
+84,7
@@
void __init spear3xx_map_io(void)
iotable_init(spear3xx_io_desc, ARRAY_SIZE(spear3xx_io_desc));
}
iotable_init(spear3xx_io_desc, ARRAY_SIZE(spear3xx_io_desc));
}
-
static
void __init spear3xx_timer_init(void)
+void __init spear3xx_timer_init(void)
{
char pclk_name[] = "pll3_clk";
struct clk *gpt_clk, *pclk;
{
char pclk_name[] = "pll3_clk";
struct clk *gpt_clk, *pclk;
@@
-112,7
+112,3
@@
static void __init spear3xx_timer_init(void)
spear_setup_of_timer();
}
spear_setup_of_timer();
}
-
-struct sys_timer spear3xx_timer = {
- .init = spear3xx_timer_init,
-};