diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-02-16 04:27:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 11:13:57 -0500 |
commit | c66699a749eb0d84c6ebc3aac659e9f71d1aba14 (patch) | |
tree | 0f358882852f57203bb894101038d36a0c9649f8 | |
parent | 73b08d2aa4245806ef1bdd48463e9a0b045c62cf (diff) |
[PATCH] clocksource: fixup is_continous changes on ARM
Fixup the is_contionous replacement by a flag field.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/arm/mach-imx/time.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/time.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/time.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index 40039b2a90b3..2703a730baf7 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c | |||
@@ -87,7 +87,7 @@ static struct clocksource clocksource_imx = { | |||
87 | .read = imx_get_cycles, | 87 | .read = imx_get_cycles, |
88 | .mask = 0xFFFFFFFF, | 88 | .mask = 0xFFFFFFFF, |
89 | .shift = 20, | 89 | .shift = 20, |
90 | .is_continuous = 1, | 90 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
91 | }; | 91 | }; |
92 | 92 | ||
93 | static int __init imx_clocksource_init(void) | 93 | static int __init imx_clocksource_init(void) |
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 2ec9a9e9a04d..45068c3d8dcc 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -395,7 +395,7 @@ static struct clocksource clocksource_ixp4xx = { | |||
395 | .read = ixp4xx_get_cycles, | 395 | .read = ixp4xx_get_cycles, |
396 | .mask = CLOCKSOURCE_MASK(32), | 396 | .mask = CLOCKSOURCE_MASK(32), |
397 | .shift = 20, | 397 | .shift = 20, |
398 | .is_continuous = 1, | 398 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
399 | }; | 399 | }; |
400 | 400 | ||
401 | unsigned long ixp4xx_timer_freq = FREQ; | 401 | unsigned long ixp4xx_timer_freq = FREQ; |
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c index 5773b55ef4a6..7e132fcccd47 100644 --- a/arch/arm/mach-netx/time.c +++ b/arch/arm/mach-netx/time.c | |||
@@ -62,7 +62,7 @@ static struct clocksource clocksource_netx = { | |||
62 | .read = netx_get_cycles, | 62 | .read = netx_get_cycles, |
63 | .mask = CLOCKSOURCE_MASK(32), | 63 | .mask = CLOCKSOURCE_MASK(32), |
64 | .shift = 20, | 64 | .shift = 20, |
65 | .is_continuous = 1, | 65 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
66 | }; | 66 | }; |
67 | 67 | ||
68 | /* | 68 | /* |
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index ee2beb400414..fc3b82a740a0 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -112,7 +112,7 @@ static struct clocksource clocksource_pxa = { | |||
112 | .read = pxa_get_cycles, | 112 | .read = pxa_get_cycles, |
113 | .mask = CLOCKSOURCE_MASK(32), | 113 | .mask = CLOCKSOURCE_MASK(32), |
114 | .shift = 20, | 114 | .shift = 20, |
115 | .is_continuous = 1, | 115 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
116 | }; | 116 | }; |
117 | 117 | ||
118 | static void __init pxa_timer_init(void) | 118 | static void __init pxa_timer_init(void) |