aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/kernel
diff options
context:
space:
mode:
authorBob Liu <lliubbo@gmail.com>2012-05-17 02:21:22 -0400
committerBob Liu <lliubbo@gmail.com>2012-05-21 02:54:26 -0400
commit3a3cf0d7b8b0e32b5c1c4216520dfd59262742b9 (patch)
tree50bb12495a482a20e6ec787d07cfaf5e843a1e0b /arch/blackfin/kernel
parent93f89519fd31c21e5d606faf4091f5905db38412 (diff)
blackfin: bf60x: fix compiling warning
Fix several compiling warning for bf60x. Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r--arch/blackfin/kernel/gptimers.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/gptimers.c b/arch/blackfin/kernel/gptimers.c
index f7afe570f880..d776773d3869 100644
--- a/arch/blackfin/kernel/gptimers.c
+++ b/arch/blackfin/kernel/gptimers.c
@@ -332,13 +332,15 @@ static void _disable_gptimers(uint16_t mask)
332 332
333void disable_gptimers(uint16_t mask) 333void disable_gptimers(uint16_t mask)
334{ 334{
335#ifndef CONFIG_BF60x
335 int i; 336 int i;
336 _disable_gptimers(mask); 337 _disable_gptimers(mask);
337#ifndef CONFIG_BF60x
338 for (i = 0; i < MAX_BLACKFIN_GPTIMERS; ++i) 338 for (i = 0; i < MAX_BLACKFIN_GPTIMERS; ++i)
339 if (mask & (1 << i)) 339 if (mask & (1 << i))
340 bfin_write(&group_regs[BFIN_TIMER_OCTET(i)]->status, trun_mask[i]); 340 bfin_write(&group_regs[BFIN_TIMER_OCTET(i)]->status, trun_mask[i]);
341 SSYNC(); 341 SSYNC();
342#else
343 _disable_gptimers(mask);
342#endif 344#endif
343} 345}
344EXPORT_SYMBOL(disable_gptimers); 346EXPORT_SYMBOL(disable_gptimers);