diff options
author | Lv Zheng <lv.zheng@intel.com> | 2014-07-16 16:58:30 +0800 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-09-18 13:40:39 +0200 |
commit | 04b13ce94fe42090c969c7c9b18c16c215f4a66d (patch) | |
tree | f70e58f8ffadedb26e88ebe8c75181bfa3427632 | |
parent | 4e8ea81c4e888b755f0d04d213aa61c676bb7f9b (diff) |
ACPICA: Linux: Allow ACPICA inclusion for CONFIG_ACPI=n builds.
This patch moves <acpi/acpi.h> out of CONFIG_ACPI condition so that all
ACPICA prototypes can be seen by the CONFIG_ACPI=n Linux kernel builds.
Note that we can do this because ACPICA has implemented stubs for all
ACPICA prototypes that are currently referenced by the Linux kernel.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 633adaba49d46dcaa4289de5b25c562b54ff575b)
-rw-r--r-- | include/linux/acpi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index cd80aa80d03e..0d112b96de86 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -29,17 +29,17 @@ #include <linux/ioport.h> /* for struct resource */ #include <linux/device.h> -#ifdef CONFIG_ACPI - #ifndef _LINUX #define _LINUX #endif +#include <acpi/acpi.h> + +#ifdef CONFIG_ACPI #include <linux/list.h> #include <linux/mod_devicetable.h> #include <linux/dynamic_debug.h> -#include <acpi/acpi.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_numa.h> |