From: Thomas Gleixner Fixup the is_contionous replacement by a flag field. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/arm/mach-imx/time.c | 2 +- arch/arm/mach-ixp4xx/common.c | 2 +- arch/arm/mach-netx/time.c | 2 +- arch/arm/mach-pxa/time.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Index: linux-2.6.20-rc4-mm1-bo/arch/arm/mach-imx/time.c =================================================================== --- linux-2.6.20-rc4-mm1-bo.orig/arch/arm/mach-imx/time.c +++ linux-2.6.20-rc4-mm1-bo/arch/arm/mach-imx/time.c @@ -87,7 +87,7 @@ static struct clocksource clocksource_im .read = imx_get_cycles, .mask = 0xFFFFFFFF, .shift = 20, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static int __init imx_clocksource_init(void) Index: linux-2.6.20-rc4-mm1-bo/arch/arm/mach-ixp4xx/common.c =================================================================== --- linux-2.6.20-rc4-mm1-bo.orig/arch/arm/mach-ixp4xx/common.c +++ linux-2.6.20-rc4-mm1-bo/arch/arm/mach-ixp4xx/common.c @@ -395,7 +395,7 @@ static struct clocksource clocksource_ix .read = ixp4xx_get_cycles, .mask = CLOCKSOURCE_MASK(32), .shift = 20, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; unsigned long ixp4xx_timer_freq = FREQ; Index: linux-2.6.20-rc4-mm1-bo/arch/arm/mach-netx/time.c =================================================================== --- linux-2.6.20-rc4-mm1-bo.orig/arch/arm/mach-netx/time.c +++ linux-2.6.20-rc4-mm1-bo/arch/arm/mach-netx/time.c @@ -62,7 +62,7 @@ static struct clocksource clocksource_ne .read = netx_get_cycles, .mask = CLOCKSOURCE_MASK(32), .shift = 20, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; /* Index: linux-2.6.20-rc4-mm1-bo/arch/arm/mach-pxa/time.c =================================================================== --- linux-2.6.20-rc4-mm1-bo.orig/arch/arm/mach-pxa/time.c +++ linux-2.6.20-rc4-mm1-bo/arch/arm/mach-pxa/time.c @@ -112,7 +112,7 @@ static struct clocksource clocksource_px .read = pxa_get_cycles, .mask = CLOCKSOURCE_MASK(32), .shift = 20, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static void __init pxa_timer_init(void) -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/