---

yaml --- r: 243266 b: refs/heads/master c: f2e0bf2 h: refs/heads/master v: v3
git-mirror · Mar 29, 2011 · 75fe0d2 · 75fe0d2
1 parent 342d018
commit 75fe0d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11f2cde1165b56c88701954088437a556ddff07f
+refs/heads/master: f2e0bf2181e4117fa7319be2c9249df968ad9096
diff --git a/trunk/arch/arm/mach-footbridge/dc21285-timer.c b/trunk/arch/arm/mach-footbridge/dc21285-timer.c
@@ -30,7 +30,7 @@ static int cksrc_dc21285_enable(struct clocksource *cs)
 	return 0;
 }
 
-static int cksrc_dc21285_disable(struct clocksource *cs)
+static void cksrc_dc21285_disable(struct clocksource *cs)
 {
 	*CSR_TIMER2_CNTL = 0;
 }