diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-12 14:53:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-12 14:53:40 +0800 |
| commit | 8134585f1c33565ea5e752a7ba9323ed3e0921f3 (patch) | |
| tree | 1fd22479884783bb498702169de744b513dd68f7 /include/acpi/platform | |
| parent | 05f74e8baccb60882ace4d0165887368e8143f3f (diff) | |
| parent | 9182148a5315d4b1de68ac74fd54cbb5da5a3703 (diff) | |
Merge tag 'v3.10.77' into linux-linaro-lsk
This is the 3.10.77 stable release
Conflicts:
drivers/video/console/Kconfig
scripts/kconfig/menu.c
Diffstat (limited to 'include/acpi/platform')
| -rw-r--r-- | include/acpi/platform/acenv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index ef04b36ca6e..f7db107abb0 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h @@ -76,6 +76,7 @@ #define ACPI_LARGE_NAMESPACE_NODE #define ACPI_DATA_TABLE_DISASSEMBLY #define ACPI_SINGLE_THREADED +#define ACPI_32BIT_PHYSICAL_ADDRESS #endif /* acpi_exec configuration. Multithreaded with full AML debugger */ |