Merge branch 'video' into release

[sfrench/cifs-2.6.git] / arch / blackfin / kernel / time-ts.c

diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c
index 0791eba40d9fdc479509682c990099299912f85a..f9715764383ed145d23b2a0caa1bbdd00fdfba58 100644 (file)
--- a/arch/blackfin/kernel/time-ts.c
+++ b/arch/blackfin/kernel/time-ts.c
@@ -66,7 +66,7 @@ static cycle_t bfin_read_cycles(struct clocksource *cs)
 
 static struct clocksource bfin_cs_cycles = {
        .name           = "bfin_cs_cycles",
-       .rating         = 350,
+       .rating         = 400,
        .read           = bfin_read_cycles,
        .mask           = CLOCKSOURCE_MASK(64),
        .shift          = 22,
@@ -115,7 +115,7 @@ static cycle_t bfin_read_gptimer0(void)
 
 static struct clocksource bfin_cs_gptimer0 = {
        .name           = "bfin_cs_gptimer0",
-       .rating         = 400,
+       .rating         = 350,
        .read           = bfin_read_gptimer0,
        .mask           = CLOCKSOURCE_MASK(32),
        .shift          = 22,