From patchwork Thu Jul 3 14:08:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4473631 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5B6169F387 for ; Thu, 3 Jul 2014 14:08:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75E4120253 for ; Thu, 3 Jul 2014 14:08:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84DAA202F2 for ; Thu, 3 Jul 2014 14:08:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755173AbaGCOIj (ORCPT ); Thu, 3 Jul 2014 10:08:39 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:59225 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752078AbaGCOIi (ORCPT ); Thu, 3 Jul 2014 10:08:38 -0400 Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue004) with ESMTP (Nemesis) id 0M5cCK-1WizyB0Xge-00xaea; Thu, 03 Jul 2014 16:08:31 +0200 From: Arnd Bergmann To: keita kobayashi Cc: Magnus Damm , Simon Horman , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org Subject: ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND Date: Thu, 03 Jul 2014 16:08:30 +0200 Message-ID: <4396372.pxzjeyg4CZ@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.11.0-18-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:f2KSf6Hln5Nyb0pgmoxj7GhmHS80Ayk8HKqKrJUyGwW M+zyIaxDbkbjp8U33Yd2+iLIUf7sJ6bu/mqWsha5YMVQjnRuP+ rw4VAInrS3VHWUOSITB6OoRJH7eJc0Wsg75QivlytTIUMhXI/Q ffqkdkyqHBICqZP2KkPwSLcBQGcZ+JA5YLA8+ukqyKaWG2akMc 85Nn4fGF/3X+znRt1Qw3shSU9DZeWbh1qAqJGxMU1nU65WNxEd K4LhFX6r9QgSQdOUVOgVGUCMkOwTBLGPIHsjbNk3p3bxaaWDs+ +420Px514eH0aFX8XfROapxuvlcLUHMhMuKtahqDpPXM15z4eu xGifMgPCOJcs6kfi7vGE= Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Patch d6d757c9a4e ("ARM: shmobile: APMU: Add Core-Standby-state for Suspend to RAM") added both an inline wrapper for shmobile_smp_apmu_suspend_init and an empty function in arch/arm/mach-shmobile/platsmp-apmu.c. We get a build failure when both are present, so this patch removes the one in the .c file and keeps the inline version. Signed-off-by: Arnd Bergmann --- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c index a05b16d..2c06810 100644 --- a/arch/arm/mach-shmobile/platsmp-apmu.c +++ b/arch/arm/mach-shmobile/platsmp-apmu.c @@ -244,6 +244,4 @@ void __init shmobile_smp_apmu_suspend_init(void) { shmobile_suspend_ops.enter = shmobile_smp_apmu_enter_suspend; } -#else -void shmobile_smp_apmu_suspend_init(void) {} #endif