diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-23 16:42:19 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-23 16:42:19 -0700 |
| commit | ee0736627d3347be0be2769fa7b26431f9726c9d (patch) | |
| tree | 203e2204daaec4cf005463fdf2c7bf380d6eef36 /drivers/clocksource/scx200_hrt.c | |
| parent | cf9972a921470b0a2da7906104bcd540b20e33bf (diff) | |
| parent | 0af48f42df15b97080b450d24219dd95db7b929a (diff) | |
Merge branch 'x86/urgent' into x86/setup
Resolved conflicts:
arch/x86/boot/memory.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
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 b92da677aa5..27f4d9637b6 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); |