diff --git a/[refs] b/[refs] index 9d51ee415a09..542aad37e375 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2693506c41c20362eefb38005ee34dca7ac8dc71 +refs/heads/master: cc02d809cc629f4e90b917aa0f9efea85221ccdb diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c index 3b91f27ab202..ee9fd7b85928 100644 --- a/trunk/arch/s390/kernel/time.c +++ b/trunk/arch/s390/kernel/time.c @@ -312,7 +312,7 @@ static struct clocksource clocksource_tod = { .mask = -1ULL, .mult = 1000, .shift = 12, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, };