Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752840AbaFDMKR (ORCPT ); Wed, 4 Jun 2014 08:10:17 -0400 Received: from mail-ig0-f179.google.com ([209.85.213.179]:52698 "EHLO mail-ig0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752805AbaFDMKO (ORCPT ); Wed, 4 Jun 2014 08:10:14 -0400 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 */ -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/