diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2013-06-13 17:47:57 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-06-13 17:47:57 +0000 |
| commit | fdc0b43fbb0e0958f13d3453dfb9df707c0af904 (patch) | |
| tree | c37d53c6100504e9855a338ef7c7f702566dc4a1 /arch/arm/mach-mvebu | |
| parent | ad9d6156a675204ac53bbfbc289055551fda5f53 (diff) | |
| parent | c589f9b4b51317cfc530812fe90a9895bd51430e (diff) | |
| download | linux-fdc0b43fbb0e0958f13d3453dfb9df707c0af904.tar.gz linux-fdc0b43fbb0e0958f13d3453dfb9df707c0af904.tar.bz2 linux-fdc0b43fbb0e0958f13d3453dfb9df707c0af904.zip | |
Merge tag 'tags/cleanup-3.11-3' into mvebu/regmap
mvebu cleanup for v3.11 (round 3)
- mvebu
- mark functions in armada-370-xp.c as static
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 1c48890bb72b..cf8e357a0a02 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c @@ -20,7 +20,6 @@ #include <linux/clk/mvebu.h> #include <linux/dma-mapping.h> #include <linux/mbus.h> -#include <linux/irqchip.h> #include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -38,18 +37,18 @@ static struct map_desc armada_370_xp_io_desc[] __initdata = { }, }; -void __init armada_370_xp_map_io(void) +static void __init armada_370_xp_map_io(void) { iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc)); } -void __init armada_370_xp_timer_and_clk_init(void) +static void __init armada_370_xp_timer_and_clk_init(void) { mvebu_clocks_init(); armada_370_xp_timer_init(); } -void __init armada_370_xp_init_early(void) +static void __init armada_370_xp_init_early(void) { char *mbus_soc_name; @@ -89,7 +88,6 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") .init_machine = armada_370_xp_dt_init, .map_io = armada_370_xp_map_io, .init_early = armada_370_xp_init_early, - .init_irq = irqchip_init, .init_time = armada_370_xp_timer_and_clk_init, .restart = mvebu_restart, .dt_compat = armada_370_xp_dt_compat, |