lkml.org 
[lkml]   [2012]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [ 045/218] ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER
On Fri, Sep 28, 2012 at 01:14:22PM -0700, Greg Kroah-Hartman wrote:
> 3.4-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Igor Grinberg <grinberg@compulab.co.il>
>
> commit 45caae74d238ef6583e9402cb8c550cc0b0f7dbd upstream.
>
> Currently, omap2_sync32k_clocksource_init() function initializes the 32K
> timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER
> setting.
> Fix this by providing a default implementation for
> !CONFIG_OMAP_32K_TIMER case.
>
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> Reviewed-by: Paul Walmsley <paul@pwsan.com>
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
> arch/arm/mach-omap2/timer.c | 7 +++++++
> 1 file changed, 7 insertions(+)

Build failure with this patch:

linux/arch/arm/mach-omap2/timer.c:308:2: error: #else after #else
linux/arch/arm/mach-omap2/timer.c:238:0: error: the conditional began here
linux/arch/arm/mach-omap2/timer.c:326:21: error: expected declaration specifiers or '...' before numeric constant
linux/arch/arm/mach-omap2/timer.c:326:24: error: expected declaration specifiers or '...' before numeric constant
linux/arch/arm/mach-omap2/timer.c:326:27: error: expected declaration specifiers or '...' before string constant
linux/arch/arm/mach-omap2/timer.c:326:47: error: expected declaration specifiers or '...' before numeric constant
linux/arch/arm/mach-omap2/timer.c:326:50: error: expected declaration specifiers or '...' before string constant
linux/arch/arm/mach-omap2/timer.c:328:21: error: invalid suffix "_secure" on integer constant
linux/arch/arm/mach-omap2/timer.c:328:21: error: expected declaration specifiers or '...' before numeric constant
linux/arch/arm/mach-omap2/timer.c:328:31: error: expected declaration specifiers or '...' before numeric constant
linux/arch/arm/mach-omap2/timer.c:328:51: error: expected declaration specifiers or '...' before string constant
linux/arch/arm/mach-omap2/timer.c:329:4: error: expected declaration specifiers or '...' before numeric constant
linux/arch/arm/mach-omap2/timer.c:329:7: error: expected declaration specifiers or '...' before string constant

--
[]'s
Herton


\
 
 \ /
  Last update: 2012-10-01 22:41    [W:0.550 / U:0.332 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site