From patchwork Wed Oct 23 20:32:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1182474 X-Patchwork-Delegate: simon.k.r.goldschmidt@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BQ/wMYJs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46z2BJ5bSRz9sP6 for ; Thu, 24 Oct 2019 07:32:56 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 74450C21E57; Wed, 23 Oct 2019 20:32:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 30D29C21DA6; Wed, 23 Oct 2019 20:32:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DF0B0C21DA6; Wed, 23 Oct 2019 20:32:44 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 9024CC21DA2 for ; Wed, 23 Oct 2019 20:32:44 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id i13so338222wmd.3 for ; Wed, 23 Oct 2019 13:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Jop08q4LOR27ExqdA8flneAECDjJ9nt3GQui2LAqEgE=; b=BQ/wMYJs8/ayUCREgrkBm3RCKk0yCeJTLxWjnwCwL9/WTUW28MRf5PPAhzw9WoTnv4 ZXqRC3VxzGRh1q7AFFjl0nmqBlciyuXmzX5/WcLIVO2L45mR+/TFxOJB1nvQzwJ1uLEL dMQcaBVDGZwEr4+DDTdmkpGRTxwTfT5HF11o0LgK4pCP7JTAhKiR7rJKUTWuhIBknI0f HaYWCJ3vfVtzad+tzKG6jLr1U7l4VKNrX8mOGiq8KvFuCQ57Y59poiSflGtOaaS5f2G/ H24nn6aDdtheP4WE/ehdNhaIYDTKi4h+BKVuDZk1eUdL8B2GNJHjxTeiTgQg7DYbCC8y bOsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Jop08q4LOR27ExqdA8flneAECDjJ9nt3GQui2LAqEgE=; b=A7QSWHzybpUV6EgoBullrkY2yih3woJwlbpugfQka3NYid64CfZ1iViCD0JlIwttZH Eu6RutGAnW5264rFpPyIl/eUVjS1C2j14ZlwVBGU8i9fvv/WocLyEeTKYBQV90d9OF8B qsxPpZStehaJ92WgVOtPeniU10bQEamLiX3CU5q1GzNERVSS8XajKG4KsCupvXI3agID 9tHS3sTLm+GifPLuKKwNDSs+5FUtTSw2OAVTaeeW6APAvY3vEDq+SQLW6ieuvuxQ7EfJ HkEJhPM+7VkppQhzbzzZm+wdtbu3ddilwJampGC7ZtJvfE+e8EzCuqyWTmAzpwfCLm8E bt2w== X-Gm-Message-State: APjAAAXpXwK+7x7+DcAMG//X+asNoUyvIi3tcoLVBA9Kf2GnboGqXjLi tu72wx5zJ2NIPEosleR4AVk= X-Google-Smtp-Source: APXvYqxIQXaGZDEJem3snmtmypyIOjL0Mh5Up4viU+3w3nZqe3eekHmpbn33dkxoJjQHx4PpmiJwWQ== X-Received: by 2002:a1c:9a43:: with SMTP id c64mr1561561wme.20.1571862764234; Wed, 23 Oct 2019 13:32:44 -0700 (PDT) Received: from ubuntu.home ([2a02:8071:6a3:700:50e:1b2d:a4c8:d388]) by smtp.gmail.com with ESMTPSA id f20sm255983wmb.6.2019.10.23.13.32.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 13:32:43 -0700 (PDT) From: Simon Goldschmidt To: Marek Vasut Date: Wed, 23 Oct 2019 22:32:30 +0200 Message-Id: <20191023203230.8815-1-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] socfpga: fix include guard in misc.h (arch vs. global) X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The file arch/arm/mach-socfpga/include/mach/misc.h used the same include guard as the global include/misc.h. Fix this by giving the arch file an arch prefix. Signed-off-by: Simon Goldschmidt Reviewed-by: Ley Foon Tan --- arch/arm/mach-socfpga/include/mach/misc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h index 27d0b6a370..f11f907e1c 100644 --- a/arch/arm/mach-socfpga/include/mach/misc.h +++ b/arch/arm/mach-socfpga/include/mach/misc.h @@ -3,8 +3,8 @@ * Copyright (C) 2016-2017 Intel Corporation */ -#ifndef _MISC_H_ -#define _MISC_H_ +#ifndef _SOCFPGA_MISC_H_ +#define _SOCFPGA_MISC_H_ #include @@ -42,4 +42,4 @@ void socfpga_sdram_remap_zero(void); void do_bridge_reset(int enable, unsigned int mask); void socfpga_pl310_clear(void); -#endif /* _MISC_H_ */ +#endif /* _SOCFPGA_MISC_H_ */