Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / clocksource / cyclone.c

diff --git a/drivers/clocksource/cyclone.c b/drivers/clocksource/cyclone.c
index 5906a0a..4f3925c 100644 (file)
--- a/drivers/clocksource/cyclone.c
+++ b/drivers/clocksource/cyclone.c
@@ -14,7 +14,7 @@
 #define CYCLONE_MPCS_OFFSET    0x51A8          /* offset to select register */
 #define CYCLONE_MPMC_OFFSET    0x51D0          /* offset to count register */
 #define CYCLONE_TIMER_FREQ     99780000        /* 100Mhz, but not really */
-#define CYCLONE_TIMER_MASK     0xFFFFFFFF      /* 32 bit mask */
+#define CYCLONE_TIMER_MASK     CLOCKSOURCE_MASK(32) /* 32 bit mask */
 
 int use_cyclone = 0;
 static void __iomem *cyclone_ptr;
@@ -28,10 +28,10 @@ static struct clocksource clocksource_cyclone = {
        .name           = "cyclone",
        .rating         = 250,
        .read           = read_cyclone,
-       .mask           = (cycle_t)CYCLONE_TIMER_MASK,
+       .mask           = CYCLONE_TIMER_MASK,
        .mult           = 10,
        .shift          = 0,
-       .is_continuous  = 1,
+       .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 static int __init init_cyclone_clocksource(void)