* Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> [121114 17:15]: > From: Kevin Hilman <khilman@xxxxxx> > > commit 908b75e8 (ARM: OMAP: add support for oscillator setup) added a new > API for oscillator setup, but is broken when CONFIG_PM=n. > > The new functions have dummy definitions when CONFIG_PM=n, but also have > full implementations available, which conflict. > > To fix, wrap the PM implmentations in #ifdef CONFIG_PM. > > Cc: Tero Kristo <t-kristo@xxxxxx> > Signed-off-by: Kevin Hilman <khilman@xxxxxx> > --- > This applies to Tony's omap-for-v3.8/pm branch, which includes my > for_3.8-pm-voltage tag where this bug was introduced. Thanks for fixing this quickly. Applied to omap-for-v3.8/pm-part2 and pushed out. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html