sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core

Browse Source
This commit is contained in:
Thomas Gleixner
2011-12-05 22:13:49 +01:00
parent 28a00184be f5a54dd795
commit 0518469d0a
15 changed files with 23 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/parisc/kernel/time.c
View File

@@ -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);
}