Merge branch 'imx/cleanup-for-3.6' of git://git.linaro.org/people/shawnguo/linux...

[~andy/linux] / arch / arm / mach-omap1 / timer.c

diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c
index fb202af01d0dc2fbb1f9622d220b90335e939de8..64c65bcb2d67574af11b0af2c64e8374317b7419 100644 (file)
--- a/arch/arm/mach-omap1/timer.c
+++ b/arch/arm/mach-omap1/timer.c
@@ -54,8 +54,7 @@ static int omap1_dm_timer_set_src(struct platform_device *pdev,
        return 0;
 }
 
-
-int __init omap1_dm_timer_init(void)
+static int __init omap1_dm_timer_init(void)
 {
        int i;
        int ret;