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: 4293611 Return-Path: X-Original-To: patchwork-linux-acpi@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 8DCF19F333 for ; Wed, 4 Jun 2014 12:12:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFCF5202D1 for ; Wed, 4 Jun 2014 12:11:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25AAC201C7 for ; Wed, 4 Jun 2014 12:11:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752818AbaFDMKQ (ORCPT ); Wed, 4 Jun 2014 08:10:16 -0400 Received: from mail-ig0-f169.google.com ([209.85.213.169]:48619 "EHLO mail-ig0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752497AbaFDMKO (ORCPT ); Wed, 4 Jun 2014 08:10:14 -0400 Received: by mail-ig0-f169.google.com with SMTP id a13so1777943igq.0 for ; Wed, 04 Jun 2014 05:10:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YeK3WwhQZp5wREOTSpLm5eHYfxT1zny/unI2dXBXt8I=; b=WcNGR7gc9wtfnoqWYiWX3qJA8V4D3Lv93bpVfB8U+2FsztzJK7AkAfL7cqvdedWLqr LQ+niR2uMDzeRa+tOVYL/2d8lqFY4NVwMs3ZiTdSKxzXdeJEYSZWSNdKbWbVLRgMsDf+ qvkgmIwSVIuTxpS+vwgA+DHcbqKwKsSjfPySP2AbVwqFEwUQiniadAaQXln/y2QcxOof fq+/yWEiO3/5dztSF0MlC2ZhDb8G8FuZsX6FDLTde7raLrOiSxnKBTdfw8xTY4nYYhju Flq9TrMJfNVhVSVwJ0fMEalFqEt/2yooBhbfN67Lhomo88n1hyN0GW3EXNxkrncaG/Dd 33dw== X-Gm-Message-State: ALoCoQnMGv4CFM0iOuyCFoOic/OLS93JZs1pmZRJJqwpXlosr4/OrQHjF+/rqBd4mWzFNRndEa+c 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> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 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 */