Merge remote-tracking branch 'asoc/fix/ep93xx' into asoc-linus

[~andy/linux] / arch / tile / kernel / time.c

diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index 5ac397ec6986cc3d8b132df2f4fd467fd69a7d44..7c353d8c2da926c9b057616db17f269fd6981f66 100644 (file)
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -159,7 +159,7 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = {
        .set_mode = tile_timer_set_mode,
 };
 
-void __cpuinit setup_tile_timer(void)
+void setup_tile_timer(void)
 {
        struct clock_event_device *evt = &__get_cpu_var(tile_timer);