Op 22 mrt. 2012, om 06:19 heeft Russ Dill het volgende geschreven: > Signed-off-by: Russ Dill <[email protected]> > --- > arch/arm/mach-omap2/board-omap3evm.c | 15 ++++++--------- > 1 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-omap3evm.c > b/arch/arm/mach-omap2/board-omap3evm.c > index a659e19..6a5e57c 100644 > --- a/arch/arm/mach-omap2/board-omap3evm.c > +++ b/arch/arm/mach-omap2/board-omap3evm.c > @@ -114,15 +114,6 @@ static struct omap_smsc911x_platform_data smsc911x_cfg = > { > > static inline void __init omap3evm_init_smsc911x(void) > { > - struct clk *l3ck; > - unsigned int rate; > - > - l3ck = clk_get(NULL, "l3_ck"); > - if (IS_ERR(l3ck)) > - rate = 100000000; > - else > - rate = clk_get_rate(l3ck);
The above hunk gets added/removed multiple times during this patch series, a rebase -i mishap? regards, Koen-- 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
