Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 166741
b: refs/heads/master
c: fac28e6
h: refs/heads/master
i:
  166739: 48922b2
v: v3
  • Loading branch information
Russell King committed Sep 28, 2009
1 parent 1ce72a0 commit 17065dc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3f944ab115f64fefa2c8ae985aafe652179fce4f
refs/heads/master: fac28e6df9b5fdfa0cf6b99eae022609dd1108d5
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-sa1100/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ static struct clock_event_device ckevt_sa1100_osmr0 = {
.set_mode = sa1100_osmr0_set_mode,
};

static cycle_t sa1100_read_oscr(void)
static cycle_t sa1100_read_oscr(struct clocksource *s)
{
return OSCR;
}
Expand Down

0 comments on commit 17065dc

Please sign in to comment.