From patchwork Tue Sep 22 18:45:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1369216 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Gl5a07Ln; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bwr9S0fdmz9sTg for ; Wed, 23 Sep 2020 04:55:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F2C75826AA; Tue, 22 Sep 2020 20:49:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Gl5a07Ln"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6549B825D1; Tue, 22 Sep 2020 20:47:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oi1-x243.google.com (mail-oi1-x243.google.com [IPv6:2607:f8b0:4864:20::243]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EB18E825CE for ; Tue, 22 Sep 2020 20:47:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oi1-x243.google.com with SMTP id a3so22195766oib.4 for ; Tue, 22 Sep 2020 11:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bvJNa7A3eSQWkxu0JC8hkmNgAuy+tTQ8oE1K5Nmju/k=; b=Gl5a07LnLUvAKNTlH7Ufv2wGliyTxX9S1k4JXemTBadtUB59M/XBkuNVFAg47vMxMJ 15dCEXs9zS/CoD+7snCqwe0Sqnva8v48uOa+zIj8MElPek3MQ3X91Uo0B3668FEPvWJS bWsTM5OSZj/yWfIauWfuDM9d0NjPmk9Q/jjrM= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=bvJNa7A3eSQWkxu0JC8hkmNgAuy+tTQ8oE1K5Nmju/k=; b=oYBE+YX5neq2Hllo1ldDMmZ/GKlM0404+T9quRy4ItGGYEzkfZmcXFb4yMZYwHaKUC 7WciY8x4I+eAhqf4fo78iMp6X7xTVHorhVA99A5SS3oetd/ZZsAAPljLtRNdviBOtXEC M7/9WSLJ6qfenpy2CAgRY93eHaSmj5BOtTTX05IhzjvPQcPMydIMFofPI2VbJqaL0Jrk fJvZM5jpWQ815AXtEkjZ8oDv0wId7VbUe9HRyy4Lsprq8gYUEMWYFYEandtqeVR0/jGC GPm3XYrGvGieW9XUqkpqBNUjBxsxkbZtwVkKmwVlCD3dFHmXzRJB+xcU5jcyOO5ikNIM +MGw== X-Gm-Message-State: AOAM530jWvwy8fotJ+3iOo72cwqo/JULt7otm4YKV0dA/la1Vo60pfD3 Q3W/wvEOesxBYLar0C9ubmPmj+vX+dCL5Zg5 X-Google-Smtp-Source: ABdhPJwkhQryPlU9u4be7mn3kBCa66CAsSp53SGJ5445q0qTXPq+VGjmOe6MlmwAfC6pkHeAlnETng== X-Received: by 2002:aca:ea44:: with SMTP id i65mr3341469oih.117.1600800428665; Tue, 22 Sep 2020 11:47:08 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id q24sm7622663oij.19.2020.09.22.11.47.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 11:47:08 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Andy Shevchenko , Wolfgang Wallner , Bin Meng , Bernhard Messerklinger , Simon Glass Subject: [PATCH v4 45/59] x86: Add a header guard to asm/acpi_table.h Date: Tue, 22 Sep 2020 12:45:30 -0600 Message-Id: <20200922124521.v4.45.I9e03b830f5f0096a5b4c9c6355280a5e09429fa9@changeid> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog In-Reply-To: <20200922184544.2920969-1-sjg@chromium.org> References: <20200922184544.2920969-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean This file cannot currently be included in ASL files. Add a header guard to permit this. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- (no changes since v1) arch/x86/include/asm/acpi_table.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h index faf31730730..1b49ccadc0c 100644 --- a/arch/x86/include/asm/acpi_table.h +++ b/arch/x86/include/asm/acpi_table.h @@ -9,6 +9,8 @@ #ifndef __ASM_ACPI_TABLE_H__ #define __ASM_ACPI_TABLE_H__ +#ifndef __ACPI__ + struct acpi_facs; struct acpi_fadt; struct acpi_global_nvs; @@ -213,4 +215,6 @@ void acpi_fadt_common(struct acpi_fadt *fadt, struct acpi_facs *facs, */ void intel_acpi_fill_fadt(struct acpi_fadt *fadt); +#endif /* !__ACPI__ */ + #endif /* __ASM_ACPI_TABLE_H__ */