---

yaml --- r: 149387 b: refs/heads/master c: b4380b8 h: refs/heads/master i: 149385: e5bbaf0 149383: 9e6facf v: v3
git-mirror · May 7, 2009 · df5d490 · df5d490
1 parent b548966
commit df5d490
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: 7bd0f2f5fc5f51d351228488dfef5e33d28e8d0c
+refs/heads/master: b4380b8e5888e5ef5872e43b610c9dac4bf253ac
diff --git a/trunk/arch/arm/plat-stmp3xxx/timer.c b/trunk/arch/arm/plat-stmp3xxx/timer.c
@@ -45,7 +45,7 @@ stmp3xxx_timer_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static cycle_t stmp3xxx_clock_read(void)
+static cycle_t stmp3xxx_clock_read(struct clocksource *cs)
 {
 	return ~((HW_TIMROT_TIMCOUNTn_RD(1) & 0xFFFF0000) >> 16);
 }