From 3d45964f6df1f77f8a2d13465e98d6786a71599f Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 26 Apr 2010 20:23:50 -0700 Subject: [PATCH] --- yaml --- r: 277423 b: refs/heads/master c: 63e496340f07b58925f690451c93171d9b04fe1e h: refs/heads/master i: 277421: f1169d577ccd7a54e21920dc750365a2546a5e34 277419: 11bc8e80c298a525c4d69770f982400b5ea93578 277415: 67d9ecfead073b8ec3459627fe68082384585389 277407: 6f115b40aff3c0539f46abce4e64fb6f28cc0dd6 v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/time.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1141c893c774..2ace83d11feb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 010f3f1692b22f8ddabdccc6526915e181e49447 +refs/heads/master: 63e496340f07b58925f690451c93171d9b04fe1e diff --git a/trunk/arch/parisc/kernel/time.c b/trunk/arch/parisc/kernel/time.c index 45b7389d77aa..7c0774397b89 100644 --- a/trunk/arch/parisc/kernel/time.c +++ b/trunk/arch/parisc/kernel/time.c @@ -198,8 +198,6 @@ static struct clocksource clocksource_cr16 = { .rating = 300, .read = read_cr16, .mask = CLOCKSOURCE_MASK(BITS_PER_LONG), - .mult = 0, /* to be set */ - .shift = 22, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -270,7 +268,5 @@ void __init time_init(void) /* register at clocksource framework */ current_cr16_khz = PAGE0->mem_10msec/10; /* kHz */ - clocksource_cr16.mult = clocksource_khz2mult(current_cr16_khz, - clocksource_cr16.shift); - clocksource_register(&clocksource_cr16); + clocksource_register_khz(&clocksource_cr16, current_cr16_khz); }