Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp144480iob; Tue, 17 May 2022 21:45:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPRqTy2TqTVhzYsPcsiTaCYEKoo2Wqu3akNm2594osTtRtdoj5HsY3luxeoYDT/sWoKI8j X-Received: by 2002:a05:6a00:10cc:b0:506:e0:d6c3 with SMTP id d12-20020a056a0010cc00b0050600e0d6c3mr26127908pfu.33.1652849120929; Tue, 17 May 2022 21:45:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652849120; cv=none; d=google.com; s=arc-20160816; b=eT0fmG5q/colBDGAq3s2cgu87r2pYUAzVA7kde+Q4mM/hRtH5irQn/j99tQkvdtVq9 I3jDZgaovrOzm1Cj0MaOcYt06ag+YXvdBohtKMnOuHpJjstEuNSCAOvU7Tnr69R9brMR uRq3btwNxyswRGHhSakE02w2x8QJ+YmRtIlshQkwBp4D8kscg7PVpnN4z4H46skQTlr/ ePxZJC+Gy/U2hRl+udpUtKvzpx9Y3Ks+3xZVMxsU+rJY2TtkAdXWOqFg/YT81+7eVi7u IKQ3niO/YXo0j9XHoj5rUVpsuROXU2L2S/9i4fQVVm0pBIGVeUIjnsF08X1d9ZVHj5Mv r6Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=0kt3a4PZNn6J2rJH0ag3oJjN3x8Q9+G2hb2qTfx6s5Q=; b=ZmdoC/xu1qf6LwzdcpqH/kTAVRzqytGLtVhOhrXNaG1EH4Mp8KuFuWlhFCjRWmlLRc q/GKaYVfvhPXl+O4TAHXhyF7sKbOAUuGXyioHTcS6/FC9tqGSTDmn7m877Ueak3I8XR7 4gSbzaknnNirSF5Uq/UV28chNpIgROKPpVA2XGSPFkGiYM6a690LLfEm4PKF/SCNglU1 R23/DWcL1h9KzCBAg80kRv0QOQCo7CKuevpAepV6n4uaSdCdGjgLkXU5kljaTPkPaEey x79fkCdLyKYQy5Tk5gzWDQiyiBySL0IpTLhXrckpzQCUDtfzs39pqDigSyz1QNc6ZBDT pW0w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id o12-20020a170902d4cc00b00158b60545dcsi1501615plg.207.2022.05.17.21.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 21:45:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CE4B9EAB97; Tue, 17 May 2022 20:57:42 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230047AbiEQDQo (ORCPT + 99 others); Mon, 16 May 2022 23:16:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229512AbiEQDQn (ORCPT ); Mon, 16 May 2022 23:16:43 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58736248F1 for ; Mon, 16 May 2022 20:16:42 -0700 (PDT) Received: from canpemm500007.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4L2Lpc5dzXzcbVg; Tue, 17 May 2022 11:15:20 +0800 (CST) Received: from localhost (10.174.179.215) by canpemm500007.china.huawei.com (7.192.104.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 17 May 2022 11:16:40 +0800 From: YueHaibing To: , , , , , CC: , , YueHaibing Subject: [PATCH -next] ARM: at91: pm: Fix rand build error Date: Tue, 17 May 2022 11:16:06 +0800 Message-ID: <20220517031606.11628-1-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.179.215] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500007.china.huawei.com (7.192.104.62) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If ATMEL_PM is y but PM is n, build fails: arch/arm/mach-at91/pm.c:1435:13: error: redefinition of ‘at91rm9200_pm_init’ void __init at91rm9200_pm_init(void) ^~~~~~~~~~~~~~~~~~ In file included from arch/arm/mach-at91/pm.c:29:0: arch/arm/mach-at91/generic.h:19:27: note: previous definition of ‘at91rm9200_pm_init’ was here static inline void __init at91rm9200_pm_init(void) { } ^~~~~~~~~~~~~~~~~~ ATMEL_PM should not be enabled independently, it is only selected by Soc. Fixes: f2f5cf78a333 ("ARM: at91: pm: add support for sama5d2 secure suspend") Signed-off-by: YueHaibing --- arch/arm/mach-at91/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 3d7e66976206..3dd9e718661b 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -219,7 +219,7 @@ config SOC_SAMA5 select SRAM if PM config ATMEL_PM - bool "Atmel PM support" + bool config ATMEL_SECURE_PM bool "Atmel Secure PM support" -- 2.17.1