From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932899Ab2HVPOz (ORCPT ); Wed, 22 Aug 2012 11:14:55 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:59062 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757290Ab2HVPNh (ORCPT ); Wed, 22 Aug 2012 11:13:37 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Russell King , linux-kernel@vger.kernel.org, Arnd Bergmann , Shawn Guo , Sascha Hauer , stable@vger.kernel.org Subject: [PATCH 3/6] ARM: imx: build pm-imx5 code only when PM is enabled Date: Wed, 22 Aug 2012 17:13:07 +0200 Message-Id: <1345648390-4234-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1345648390-4234-1-git-send-email-arnd@arndb.de> References: <1345648390-4234-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:v3FtPFwQxFF2RP6esnaJXbVdaaB3CBfX+Do6qm/t0ss QrGQAGZHvuCQ1wfCr1YwXXC3qCaOKsn61qSUv5UiTEhV4G7gWZ iT+pMwuvLyN2KikhKP29D4sXNsnZReezjzMwVqEQw+lV+qYUfT lPzr7GsXkTLyXxzPaI6hhh3SsaRYsxGQhE60bWFKArnrb6UA66 kSbjY1AMOrRIdMqwqG1jD+DgFL2NQKjG427JrzFcHg523MCxcK 4Jk9FQK8VlFzEzF+bhO8NKDx2wVciqexSV35uODgcoOSJo6+ix +1I2mKQ5A7MtuFeFG5LODyRIb/UFALVr+mKJYXW0+jqBF6edTU iPadQ6ObLD36cHosy2t8jk+zMUqXtUop+b1ukO6ZiAaxInekhe WVHBYrQuOeUjA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This moves the imx5 pm code out of the list of unconditionally compiled files for imx5, mirroring what we already do for imx6 and how it was done before the code was move from mach-mx5 to mach-imx in v3.3. Without this patch, building with CONFIG_PM disabled results in: arch/arm/mach-imx/pm-imx5.c:202:116: error: redefinition of 'imx51_pm_init' arch/arm/mach-imx/include/mach-imx/common.h:154:91: note: previous definition of 'imx51_pm_init' was here arch/arm/mach-imx/pm-imx5.c:209:116: error: redefinition of 'imx53_pm_init' arch/arm/mach-imx/include/mach-imx/common.h:155:91: note: previous definition of 'imx53_pm_init' was here Signed-off-by: Arnd Bergmann Cc: Shawn Guo Cc: Sascha Hauer Cc: stable@vger.kernel.org --- arch/arm/mach-imx/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 07f7c22..e08adb7 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -9,7 +9,8 @@ obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clk-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx3.o -obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o pm-imx5.o cpu_op-mx51.o +imx5-pm-$(CONFIG_PM) += pm-imx5.o +obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(imx5-pm-y) cpu_op-mx51.o obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \ clk-pfd.o clk-busy.o -- 1.7.10