diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-04 13:19:05 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-04 13:19:05 -0700 |
| commit | 6a33fc8cacfc7fac829c72bd321868be7e72f609 (patch) | |
| tree | ca8572f214a30c4743b731b4ab2809a980b78369 /arch/mips/mti-sead3/sead3-time.c | |
| parent | 3bd957978bb50390bb07678bc4c125989e9a81a2 (diff) | |
| parent | 2746a7c272a3242f919fa2fd5a5f2d9f8a41173a (diff) | |
| download | linux-rt-6a33fc8cacfc7fac829c72bd321868be7e72f609.tar.gz | |
Merge tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
From Jason Cooper:
mvebu fixes-non-critical for v3.12
- dove
- fix section mismatch (all callers are already _init, so it's just a space
issue)
* tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu:
ARM: dove: fix missing __init section of dove_mpp_gpio_mode
+ Linux 3.11-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/mips/mti-sead3/sead3-time.c')
| -rw-r--r-- | arch/mips/mti-sead3/sead3-time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mti-sead3/sead3-time.c b/arch/mips/mti-sead3/sead3-time.c index 96b42eb9b5e2..a43ea3cc0a3b 100644 --- a/arch/mips/mti-sead3/sead3-time.c +++ b/arch/mips/mti-sead3/sead3-time.c @@ -91,7 +91,7 @@ static void __init plat_perf_setup(void) } } -unsigned int __cpuinit get_c0_compare_int(void) +unsigned int get_c0_compare_int(void) { if (cpu_has_vint) set_vi_handler(cp0_compare_irq, mips_timer_dispatch); |