* Tony Lindgren <[email protected]> [110110 11:06]: > * Paul Walmsley <[email protected]> [110110 10:58]: > > On Mon, 10 Jan 2011, Paul Walmsley wrote: > > > > > Looks good to me. Tony, do you want to merge this one as part of the -rc > > > series? If so then it is: > > > > > > Acked-by: Paul Walmsley <[email protected]> > > > > (once Santosh reposts the updated fix, that is) > > OK thanks will queue.
I've queued the following updated version. Regards, Tony From: Santosh Shilimkar <[email protected]> Date: Sun, 9 Jan 2011 22:16:13 +0000 Subject: [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here At latest mainline commit 0c21e3aaf6a, omap2plus build is broken. This patch is trivial fix for the missed usb clock node for CK_3430ES2PLUS flag update. CHK include/generated/compile.h CC arch/arm/mach-omap2/clock3xxx_data.o arch/arm/mach-omap2/clock3xxx_data.c:3289: error: 'CK_3430ES2' undeclared here (not in a function) make[1]: *** [arch/arm/mach-omap2/clock3xxx_data.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 Signed-off-by: Santosh Shilimkar <[email protected]> Acked-by: Anand Gadiyar <[email protected]> Acked-by: Paul Walmsley <[email protected]> [[email protected]: updated mask to include CK_36XX] Signed-off-by: Tony Lindgren <[email protected]> --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c @@ -3286,7 +3286,7 @@ static struct omap_clk omap3xxx_clks[] = { CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX), CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX), CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX), - CLK("ehci-omap.0", "usbtll_fck", &usbtll_fck, CK_3430ES2 | CK_AM35XX), + CLK("ehci-omap.0", "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX), CLK("omap-mcbsp.1", "prcm_fck", &core_96m_fck, CK_3XXX), CLK("omap-mcbsp.5", "prcm_fck", &core_96m_fck, CK_3XXX), CLK(NULL, "core_96m_fck", &core_96m_fck, CK_3XXX), -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
