Make opp3xx data which is registered with the opp layer dependent purely on CONFIG_PM as opp layer and pm.c users are CONFIG_PM dependent not cpufreq dependent. so we rename the data definition to opp3xxx_data.c (inline with what we have for omap2), also move the build definition to be under the existing CONFIG_PM build instead of CPUFREQ. Cc: Eduardo Valentin <eduardo.valentin@xxxxxxxxx> Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> Cc: Paul Walmsley <paul@xxxxxxxxx> Cc: Rajendra Nayak <rnayak@xxxxxx> Cc: Sanjeev Premi <premi@xxxxxx> Cc: Thara Gopinath <thara@xxxxxx> Cc: Tony Lindgren <tony@xxxxxxxxxxx> Signed-off-by: Nishanth Menon <nm@xxxxxx> --- Note: This takes care of the discussion on opp file renaming and making it independent of cpufreq, unless I missed something else arch/arm/mach-omap2/Makefile | 5 +---- .../mach-omap2/{cpufreq34xx.c => opp3xxx_data.c} | 0 2 files changed, 1 insertions(+), 4 deletions(-) rename arch/arm/mach-omap2/{cpufreq34xx.c => opp3xxx_data.c} (100%) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 0b188fa..43d7372 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -58,11 +58,8 @@ obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3) += smartreflex-class3.o AFLAGS_sleep24xx.o :=-Wa,-march=armv6 AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a -endif +obj-$(CONFIG_ARCH_OMAP3) += opp3xxx_data.o -# CPU Frequency -ifeq ($(CONFIG_CPU_FREQ),y) -obj-$(CONFIG_ARCH_OMAP3) += cpufreq34xx.o endif # PRCM diff --git a/arch/arm/mach-omap2/cpufreq34xx.c b/arch/arm/mach-omap2/opp3xxx_data.c similarity index 100% rename from arch/arm/mach-omap2/cpufreq34xx.c rename to arch/arm/mach-omap2/opp3xxx_data.c -- 1.6.3.3 -- 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