diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-07 01:05:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-07 01:05:17 +0100 |
| commit | 9ccad66f0171578445175ecd3bf66b35a96aaf6e (patch) | |
| tree | 78c1be21493ef183de9444cf0d2bfb1e729b0698 /arch/ia64/hp | |
| parent | 8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (diff) | |
| parent | 8b48463f89429af408ff695244dc627e1acff4f7 (diff) | |
| download | op-kernel-dev-9ccad66f0171578445175ecd3bf66b35a96aaf6e.zip op-kernel-dev-9ccad66f0171578445175ecd3bf66b35a96aaf6e.tar.gz | |
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts:
drivers/acpi/scan.c
Diffstat (limited to 'arch/ia64/hp')
| -rw-r--r-- | arch/ia64/hp/common/aml_nfw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/hp/common/aml_nfw.c b/arch/ia64/hp/common/aml_nfw.c index 916ffe7..84715fc 100644 --- a/arch/ia64/hp/common/aml_nfw.c +++ b/arch/ia64/hp/common/aml_nfw.c @@ -23,8 +23,7 @@ */ #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/sal.h> MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>"); |
