diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-26 19:03:27 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-26 19:03:27 -0500 |
| commit | 2d304ba757eb79f58451538497b4f556555e3eb7 (patch) | |
| tree | 6deb6799a3a3743047045324ad5218936b9f35b4 /drivers/acpi/nvs.c | |
| parent | 434a438af20865cd41ab08c07281b72637460e41 (diff) | |
| parent | 91be0998578a1001db1382012676ee0a69d5cee3 (diff) | |
Merge branch 'acpica'
* acpica:
ACPI: Clean up incorrect inclusions of ACPICA headers
ACPICA: Update version to 20131115.
ACPICA: Add support to delete all objects attached to the root namespace node.
ACPICA: Delete all attached data objects during namespace node deletion.
ACPICA: Resources: Fix loop termination for the get AML length function.
ACPICA: Tests: Add CHECKSUM_ABORT protection for test utilities.
ACPICA: Debug output: Do not emit function nesting level for kernel build.
Diffstat (limited to 'drivers/acpi/nvs.c')
| -rw-r--r-- | drivers/acpi/nvs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c index 266bc58ce0ce..386a9fe497b4 100644 --- a/drivers/acpi/nvs.c +++ b/drivers/acpi/nvs.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
| 14 | #include <linux/acpi.h> | 14 | #include <linux/acpi.h> |
| 15 | #include <linux/acpi_io.h> | 15 | #include <linux/acpi_io.h> |
| 16 | #include <acpi/acpiosxf.h> | ||
| 17 | 16 | ||
| 18 | /* ACPI NVS regions, APEI may use it */ | 17 | /* ACPI NVS regions, APEI may use it */ |
| 19 | 18 | ||