From: Thara Gopinath <thara@xxxxxx> This patch removes the dependency of the opp layer on cpufreq layer. OPP layer is now enabled to compile and exist in the system irrespective of whether cpu freq layer is enabled or not. [NM Note: Original Patch: https://patchwork.kernel.org/patch/111664/ Still pending: http://marc.info/?l=linux-omap&m=127530955314582&w=2 To be squashed to patch 1 ] Signed-off-by: Thara Gopinath <thara@xxxxxx> --- arch/arm/plat-omap/Makefile | 4 ++-- arch/arm/plat-omap/include/plat/opp.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index faf831d..852fa33 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -13,7 +13,7 @@ obj- := obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o # OPP support in (OMAP3+ only at the moment) -ifdef CONFIG_CPU_FREQ +ifdef CONFIG_PM obj-$(CONFIG_ARCH_OMAP3) += opp.o obj-$(CONFIG_TWL4030_CORE) += opp_twl_tps.o endif @@ -37,4 +37,4 @@ obj-y += $(i2c-omap-m) $(i2c-omap-y) # OMAP mailbox framework obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o -obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o \ No newline at end of file +obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o diff --git a/arch/arm/plat-omap/include/plat/opp.h b/arch/arm/plat-omap/include/plat/opp.h index 403b69b..f9feb8d 100644 --- a/arch/arm/plat-omap/include/plat/opp.h +++ b/arch/arm/plat-omap/include/plat/opp.h @@ -61,7 +61,7 @@ struct omap_opp_def { struct omap_opp; -#ifdef CONFIG_CPU_FREQ +#ifdef CONFIG_PM unsigned long opp_get_voltage(const struct omap_opp *opp); @@ -156,5 +156,5 @@ void opp_init_cpufreq_table(struct omap_opp *opps, { } -#endif /* CONFIG_CPU_FREQ */ +#endif /* CONFIG_PM */ #endif /* __ASM_ARM_OMAP_OPP_H */ -- 1.7.2.1 -- 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
