From: Lv Zheng <lv.zheng@xxxxxxxxx> The header file <acpi/acpi.h> is the top level header for other kernel subsystems to include. It contains environemnt settings and architecture specific implementation that should be included before including other ACPICA headers in order to keep a consistent build environment for ACPICA users. All following internal ACPICA header files thus should be included from <acpi/acpi.h> and not included by other kernel files: <acpi/acnames.h> <acpi/actypes.h> <acpi/acexcep.h> <acpi/acexcep.h> <acpi/acoutput.h> <acpi/acrestyp.h> <acpi/acpiosxf.h> <acpi/acpixf.h> <acpi/acconfig.h>: included by <acpi/acpixf.h> <acpi/acconfig.h> <acpi/actbl.h> <acpi/actbl1.h>: included by <acpi/actbl.h> <acpi/actbl2.h>: included by <acpi/actbl.h> <acpi/actbl3.h>: included by <acpi/actbl.h> <acpi/platform/acenv.h> <acpi/platform/aclinux.h>: included by <acpi/platform/acenv.h> This patch cleans up inclusions of above files from non ACPICA source files. Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx> --- drivers/acpi/nvs.c | 1 - drivers/hwmon/asus_atk0110.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c index 266bc58..386a9fe 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 */ diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index 1d7ff46..dafc63c 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c @@ -18,7 +18,6 @@ #include <linux/err.h> #include <acpi/acpi.h> -#include <acpi/acpixf.h> #include <acpi/acpi_drivers.h> #include <acpi/acpi_bus.h> -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html