From patchwork Sat Aug 13 22:34:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Huewe X-Patchwork-Id: 1063682 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7DMYBeN020479 for ; Sat, 13 Aug 2011 22:34:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752623Ab1HMWeK (ORCPT ); Sat, 13 Aug 2011 18:34:10 -0400 Received: from mailout-de.gmx.net ([213.165.64.23]:37241 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752560Ab1HMWeJ (ORCPT ); Sat, 13 Aug 2011 18:34:09 -0400 Received: (qmail invoked by alias); 13 Aug 2011 22:34:07 -0000 Received: from dslb-084-056-010-162.pools.arcor-ip.net (EHLO localhost.localdomain) [84.56.10.162] by mail.gmx.net (mp043) with SMTP; 14 Aug 2011 00:34:07 +0200 X-Authenticated: #12255092 X-Provags-ID: V01U2FsdGVkX18PbB4nigAPnLRbqqO+NK6JJiOy+MQ+RggmTM927b W6dueiDCxpf9ke From: Peter Huewe To: "Rafael J. Wysocki" , Paul Mundt Cc: Magnus Damm , Russell King , linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peter Huewe Subject: [PATCH] shmobile/sh7372: Add missing CONFIG_PM guards to fix build failure Date: Sun, 14 Aug 2011 00:34:01 +0200 Message-Id: <1313274841-8322-1-git-send-email-peterhuewe@gmx.de> X-Mailer: git-send-email 1.7.3.4 X-Y-GMX-Trusted: 0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 13 Aug 2011 22:34:11 +0000 (UTC) This patch fixes a build failure with the ap4evb_defconfig by adding the missing #ifdef CONFIG_PM. The build failure was: arch/arm/mach-shmobile/setup-sh7372.c:852: error: 'sh7372_a4lc' undeclared (first use in this function) arch/arm/mach-shmobile/setup-sh7372.c:852: error: (Each undeclared identifier is reported only once arch/arm/mach-shmobile/setup-sh7372.c:852: error: for each function it appears in.) sh7372_a4lc is declared in arch/arm/mach-shmobile/pm-sh7372.c within a #ifdef CONFIG_PM block. Since the defconfig is missing CONFIG_PM this results in a build failure. KernelVersion: linux-next 20110812 (cab7d82) Signed-off-by: Peter Huewe --- arch/arm/mach-shmobile/setup-sh7372.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c index df900bf..8455f0b 100644 --- a/arch/arm/mach-shmobile/setup-sh7372.c +++ b/arch/arm/mach-shmobile/setup-sh7372.c @@ -848,9 +848,9 @@ void __init sh7372_add_standard_devices(void) sh7372_init_pm_domain(&sh7372_a3rv); sh7372_init_pm_domain(&sh7372_a3ri); sh7372_init_pm_domain(&sh7372_a3sg); - +#ifdef CONFIG_PM pm_genpd_add_subdomain(&sh7372_a4lc.genpd, &sh7372_a3sg.genpd); - +#endif platform_add_devices(sh7372_early_devices, ARRAY_SIZE(sh7372_early_devices));