diff options
| author | James Morris <jmorris@namei.org> | 2009-05-08 11:56:47 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-08 11:56:47 +0400 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /drivers/clocksource/scx200_hrt.c | |
| parent | 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb (diff) | |
| parent | 8c9ed899b44c19e81859fbb0e9d659fe2f8630fc (diff) | |
| download | linux-d254117099d711f215e62427f55dfb8ebd5ad011.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/clocksource/scx200_hrt.c')
| -rw-r--r-- | drivers/clocksource/scx200_hrt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/scx200_hrt.c b/drivers/clocksource/scx200_hrt.c index b92da677aa5d..27f4d9637b62 100644 --- a/drivers/clocksource/scx200_hrt.c +++ b/drivers/clocksource/scx200_hrt.c @@ -43,7 +43,7 @@ MODULE_PARM_DESC(ppm, "+-adjust to actual XO freq (ppm)"); /* The base timer frequency, * 27 if selected */ #define HRT_FREQ 1000000 -static cycle_t read_hrt(void) +static cycle_t read_hrt(struct clocksource *cs) { /* Read the timer value */ return (cycle_t) inl(scx200_cb_base + SCx200_TIMER_OFFSET); |