diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-28 01:52:05 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-28 01:52:05 +0400 |
| commit | 7e1c1a82f505e79a85a822a377bd3369e676ac2d (patch) | |
| tree | cdb9234e3f803d4c34c543a78c3711b26a292bfc /drivers/acpi | |
| parent | 92a18409ba03c1f810b831919596122c60586bc5 (diff) | |
| parent | 417b4a73b62760db67512892c32f8acc008ab54e (diff) | |
| download | linux-7e1c1a82f505e79a85a822a377bd3369e676ac2d.tar.xz | |
Merge branch 'acpi-headers'
* acpi-headers:
ACPI: Add support to force header inclusion rules for <acpi/acpi.h>.
ACPI / SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - table definitions.
ACPICA: Linux: Allow ACPICA inclusion for CONFIG_ACPI=n builds.
ACPICA: Linux: Add support to exclude <asm/acenv.h> inclusion.
ACPICA: Linux: Add stub implementation of ACPICA 64-bit mathematics.
ACPICA: Linux: Add stub support for Linux specific variables and functions.
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/Makefile | 2 | ||||
| -rw-r--r-- | drivers/acpi/bus.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile index 6b9ec239d578..4be4cc94572d 100644 --- a/drivers/acpi/acpica/Makefile +++ b/drivers/acpi/acpica/Makefile @@ -2,7 +2,7 @@ # Makefile for ACPICA Core interpreter # -ccflags-y := -Os +ccflags-y := -Os -DBUILDING_ACPICA ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT # use acpi.o to put all files here into acpi.o modparam namespace diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index c5bc8cfe09fa..8581f5b84f48 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -477,9 +477,6 @@ static int __init acpi_bus_init_irq(void) return 0; } -u8 acpi_gbl_permanent_mmap; - - void __init acpi_early_init(void) { acpi_status status; |