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 <grinb...@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 <grinb...@compulab.co.il> > Reviewed-by: Paul Walmsley <p...@pwsan.com> > Acked-by: Santosh Shilimkar <santosh.shilim...@ti.com> > Signed-off-by: Tony Lindgren <t...@atomide.com> > Signed-off-by: Greg Kroah-Hartman <gre...@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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
