From patchwork Wed Jun 4 12:09:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 31346 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4471C203AC for ; Wed, 4 Jun 2014 12:10:15 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id c1sf3063329igq.10 for ; Wed, 04 Jun 2014 05:10:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=YeK3WwhQZp5wREOTSpLm5eHYfxT1zny/unI2dXBXt8I=; b=e6ZQGbueA0e+78WkJ1qjXsf77pCy/wEyAyA4PzFd3LR7d7IqriXFN3uEdvy7SXL/hL Uvu3SRc7QlRiYN7iFEShygOXyZya7yOBM5R0ufqVFv5PAEI4i6TBqwvviHPveD/J8uO6 zNLOxT/IPid0FMKJWt2YXl2tVNt1dGxSRkXz8Y46eZAOB2OK5pdn6Q5K6FEx533s3NdE H6BfTC2vv4OT8BMsD++AB3WUDcGSwvdxZthVqqsfTwBOrTyliFeOwx2TACwjt7arCZyQ YKDUuHIYwlaGb2xpT+KiO6hrQnB4VqnAn7TlI9ozGJL8TIMh9W+90mibmPgXLizMTZBR uSpQ== X-Gm-Message-State: ALoCoQkt7vHeiQiT80xfAzBRZHM5iB0OeK3U/cC9IAc1lxh9I/JYI7Legzu0d555RhJkddyuW4E/ X-Received: by 10.50.73.74 with SMTP id j10mr1859735igv.1.1401883814735; Wed, 04 Jun 2014 05:10:14 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.145 with SMTP id g17ls2923245qge.76.gmail; Wed, 04 Jun 2014 05:10:14 -0700 (PDT) X-Received: by 10.58.188.37 with SMTP id fx5mr43679899vec.17.1401883814627; Wed, 04 Jun 2014 05:10:14 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id fl16si1361693vec.81.2014.06.04.05.10.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Jun 2014 05:10:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id id10so8383719vcb.20 for ; Wed, 04 Jun 2014 05:10:14 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr1257740vca.45.1401883814519; Wed, 04 Jun 2014 05:10:14 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp39864vcb; Wed, 4 Jun 2014 05:10:14 -0700 (PDT) X-Received: by 10.50.43.136 with SMTP id w8mr6615987igl.20.1401883813994; Wed, 04 Jun 2014 05:10:13 -0700 (PDT) Received: from mail-ie0-f174.google.com (mail-ie0-f174.google.com [209.85.223.174]) by mx.google.com with ESMTPS id gb7si9110602igd.22.2014.06.04.05.10.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Jun 2014 05:10:13 -0700 (PDT) Received-SPF: pass (google.com: domain of lee.jones@linaro.org designates 209.85.223.174 as permitted sender) client-ip=209.85.223.174; Received: by mail-ie0-f174.google.com with SMTP id lx4so6889236iec.5 for ; Wed, 04 Jun 2014 05:10:13 -0700 (PDT) X-Received: by 10.50.43.201 with SMTP id y9mr6624280igl.12.1401883813746; Wed, 04 Jun 2014 05:10:13 -0700 (PDT) Received: from localhost.localdomain (host109-148-113-200.range109-148.btcentralplus.com. [109.148.113.200]) by mx.google.com with ESMTPSA id on9sm10028136igb.11.2014.06.04.05.10.10 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Jun 2014 05:10:13 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: wsa@the-dreams.de, grant.likely@linaro.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linus.walleij@linaro.org, Lee Jones , Lv Zheng , "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, devel@acpica.org Subject: [PATCH 1/7] ACPICA: Only include ACPI asm files if ACPI is enabled Date: Wed, 4 Jun 2014 13:09:50 +0100 Message-Id: <1401883796-17841-2-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1401883796-17841-1-git-send-email-lee.jones@linaro.org> References: <1401883796-17841-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Any drivers which support ACPI and Device Tree probing need to include both respective header files. Without this patch, if a driver is being used on a platform which does not support ACPI and subsequently does not have the config option enabled, but includes linux/acpi.h the build breaks with: In file included from ../include/acpi/platform/acenv.h:150:0, from ../include/acpi/acpi.h:56, from ../include/linux/match.h:2, from ../drivers/i2c/i2c-core.c:43: ../include/acpi/platform/aclinux.h:73:23: fatal error: asm/acenv.h: No such file or directory #include ^ Cc: Lv Zheng Cc: Rafael J. Wysocki Cc: linux-acpi@vger.kernel.org Cc: devel@acpica.org Signed-off-by: Lee Jones --- include/acpi/platform/aclinux.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index cd1f052..fdf7663 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -70,9 +70,10 @@ #ifdef EXPORT_ACPI_INTERFACES #include #endif -#include -#ifndef CONFIG_ACPI +#ifdef CONFIG_ACPI +#include +#else /* External globals for __KERNEL__, stubs is needed */