From: Lv Zheng <lv.zheng@intel.com>
Date: Fri, 6 Dec 2013 08:51:46 +0000 (+0800)
Subject: ACPI: Clean up incorrect inclusion of an ACPICA header
X-Git-Tag: firefly_0821_release~176^2~4583^2~12^2~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe5e49cb5ac57f984a44287cf123fbbc712d7bec;p=firefly-linux-kernel-4.4.55.git

ACPI: Clean up incorrect inclusion of an ACPICA header

Since drivers/acpi/nvs.c includes <linux/acpi.h> and is only compiled
for CONFIG_ACPI set, it doesn't need to include <acpi/acpiosxf.h>
directly, which is formally incorrect.  Remove the <acpi/acpiosxf.h>
inclusion from that file.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
[rjw: Subject and changelog]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

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 @@
 #include <linux/slab.h>
 #include <linux/acpi.h>
 #include <linux/acpi_io.h>
-#include <acpi/acpiosxf.h>
 
 /* ACPI NVS regions, APEI may use it */