From patchwork Mon Jun 20 16:08:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102127 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1585357qgy; Mon, 20 Jun 2016 09:08:42 -0700 (PDT) X-Received: by 10.66.253.70 with SMTP id zy6mr21866635pac.55.1466438922669; Mon, 20 Jun 2016 09:08:42 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 66si33975858pfo.203.2016.06.20.09.08.42; Mon, 20 Jun 2016 09:08:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755584AbcFTQIg (ORCPT + 30 others); Mon, 20 Jun 2016 12:08:36 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:49695 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755534AbcFTQI0 (ORCPT ); Mon, 20 Jun 2016 12:08:26 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue005) with ESMTPA (Nemesis) id 0MLT3m-1bFZxp23Os-000ekl; Mon, 20 Jun 2016 18:07:31 +0200 From: Arnd Bergmann To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Cc: Ben Dooks , Arnd Bergmann , Russell King , Simon Guinot , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: mvebu: compile pm code conditionally Date: Mon, 20 Jun 2016 18:08:22 +0200 Message-Id: <20160620160931.2714557-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:uCjaU8OaLPvGRPzJUONdWLVSN7v07Po/88BUeOPz3UT66qs3U+n rao9E8sJLkLaKu1eGjFBJYfqecT5qHnvHaJde5w1r1jA8YNzuuPLy0Co62HPU3H1NoOWjAV Y7iLfQlGgxF+iCnzd2NPLETBV7DpOtR3QsZKfNrzHOExSgrg+lcIGfTKzvsd/bDo52Bpa7A 0fPJi7v/OsJ5TW2C99wYw== X-UI-Out-Filterresults: notjunk:1; V01:K0:NFtz5YbVXrE=:PReUooKhhTTD5Aizr/l5cc faMOnJ+oUHTDsqa/aUK0kK1H++FGpp0Lgy+LaVllbzIQvVWa9bUl6FyKrUiNmX8p+s2BGWwty 5QdZ6s9rnaMr/K1xi76tCSoocqut8dLKBdXOu2h0r9zAPUsgsADY12aEgnKbOPq8QdtDnVPou 3rI3EvdWBQlMeN+92Wylg9OcEPAJi2ssyx8hPAWvPEFjrxhnYPokyIwpYnQS/Dond9YVbNs12 rrvpBABRU2llclyEsQH9gSNPaDkX61rSVOPge659mOq9My4Wjtw4lxovTrWiSTUZa03PpU4CQ OF9T1wS4eZKYi8dfNlMJ8HXnK1sbtvDwS5Eag3hqZ02g+Xkkam74h0oBhGeEcDa1d53nOOn/+ bGq97+W1iyy+nnIBOqiKiyBSKUEFlDHwt61CkeR9507/i6RFMFPR+7S2ReY15mo0iHIdr+CZG goZlSOelF58LLQ1hF2irLzA9MaOM2LANRP/p7y+twrMlMAhBbdZ3AZuLW3qq64ZTomeNrnVE5 Zi2gH5HF5hO6dZuBWJDu9O1jQhTNoigigfcVxjvmFIlbcKqthg8M1F+Gq5CkiuzO5B+Qxu4Yf lrjEpHkhtpCbAeTFBfRJl0wQtEbiCXcztJ0xf8XTbS9Vdfq+X9HizS476MkDUxDyZBkONuQA8 XKLDZ2J2Q0QuNT1V1+K/V1VkoRCQOsxnSD0J9rFx8NwMF0IO+C+X7Vd9GNZj0Zd4UA9s= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A cleanup to include the headers correctly caused another build problem: arch/arm/mach-mvebu/kirkwood-pm.c:70:13: error: redefinition of 'kirkwood_pm_init' arch/arm/mach-mvebu/kirkwood-pm.h:23:20: note: previous definition of 'kirkwood_pm_init' was here The underlying issue is that kirkwood-pm.o is not actually meant to be used when CONFIG_PM is disabled, so we should also leave it out of the Makefile. The same seems to be true for the PM code in MACH_MVEBU_V7, and I'm treating it the same way here. Signed-off-by: Arnd Bergmann Fixes: d705c1a66e15 ("ARM: Kirkwood: fix kirkwood_pm_init() declaration/type") --- arch/arm/mach-mvebu/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 568863e1513c..6c6497e80a7b 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -6,9 +6,15 @@ CFLAGS_pmsu.o := -march=armv7-a obj-$(CONFIG_MACH_MVEBU_ANY) += system-controller.o mvebu-soc-id.o ifeq ($(CONFIG_MACH_MVEBU_V7),y) -obj-y += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o pm.o pm-board.o +obj-y += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o + +obj-$(CONFIG_PM) += pm.o pm-board.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o endif obj-$(CONFIG_MACH_DOVE) += dove.o -obj-$(CONFIG_MACH_KIRKWOOD) += kirkwood.o kirkwood-pm.o + +ifeq ($(CONFIG_MACH_KIRKWOOD),y) +obj-y += kirkwood.o +obj-$(CONFIG_PM) += kirkwood-pm.o +endif