aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-omap/dmtimer.c2
-rw-r--r--arch/arm/plat-omap/include/plat/dmtimer.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 4c28452ba078..efe47744b491 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -128,7 +128,7 @@ static int omap_dm_timer_reset(struct omap_dm_timer *timer)
128 return 0; 128 return 0;
129} 129}
130 130
131int omap_dm_timer_prepare(struct omap_dm_timer *timer) 131static int omap_dm_timer_prepare(struct omap_dm_timer *timer)
132{ 132{
133 int rc; 133 int rc;
134 134
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h
index c5c890dabca4..40383b68a099 100644
--- a/arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -286,8 +286,6 @@ struct omap_dm_timer {
286 struct list_head node; 286 struct list_head node;
287}; 287};
288 288
289int omap_dm_timer_prepare(struct omap_dm_timer *timer);
290
291static inline u32 __omap_dm_timer_read(struct omap_dm_timer *timer, u32 reg, 289static inline u32 __omap_dm_timer_read(struct omap_dm_timer *timer, u32 reg,
292 int posted) 290 int posted)
293{ 291{