diff --git a/[refs] b/[refs] index 542aad37e375..c15185de56a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc02d809cc629f4e90b917aa0f9efea85221ccdb +refs/heads/master: 877fe38029366c19def24359627db8cc24d9fef6 diff --git a/trunk/arch/mips/kernel/time.c b/trunk/arch/mips/kernel/time.c index 545fcbc8cea2..e5e56bd498db 100644 --- a/trunk/arch/mips/kernel/time.c +++ b/trunk/arch/mips/kernel/time.c @@ -307,7 +307,7 @@ static unsigned int __init calibrate_hpt(void) struct clocksource clocksource_mips = { .name = "MIPS", .mask = 0xffffffff, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static void __init init_mips_clocksource(void)