diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-18 01:53:28 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-18 01:53:28 +0100 |
| commit | bcef50814c9de8e0672d3e7f9f1abd85e1b95d13 (patch) | |
| tree | 751337a429d58b60e03e22d2a30fccd87e1bc02a /include/acpi | |
| parent | d2716578e439a5a693d0817e8ab89802b33b4ded (diff) | |
| parent | 7919010c4224e07b871f3b5513d245cc029fcd67 (diff) | |
| download | linux-rpi-bcef50814c9de8e0672d3e7f9f1abd85e1b95d13.tar.gz linux-rpi-bcef50814c9de8e0672d3e7f9f1abd85e1b95d13.tar.bz2 linux-rpi-bcef50814c9de8e0672d3e7f9f1abd85e1b95d13.zip | |
Merge branch 'acpi-config' into acpica
Conflicts:
include/acpi/platform/aclinux.h
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/platform/aclinux.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 1ab66659f904..93c55ed7c53d 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -54,6 +54,12 @@ #define ACPI_USE_SYSTEM_INTTYPES +/* Compile for reduced hardware mode only with this kernel config */ + +#ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY +#define ACPI_REDUCED_HARDWARE 1 +#endif + #include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> |