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 /drivers/xen/xen-acpi-cpuhotplug.c | |
| parent | Merge branch 'acpi-pci-hotplug' into acpi-hotplug (diff) | |
| parent | ACPI: Clean up inclusions of ACPI header files (diff) | |
| download | linux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.tar.xz linux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.zip | |
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts:
drivers/acpi/scan.c
Diffstat (limited to 'drivers/xen/xen-acpi-cpuhotplug.c')
| -rw-r--r-- | drivers/xen/xen-acpi-cpuhotplug.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/xen/xen-acpi-cpuhotplug.c b/drivers/xen/xen-acpi-cpuhotplug.c index 73496c3d18ae..80875fb770ed 100644 --- a/drivers/xen/xen-acpi-cpuhotplug.c +++ b/drivers/xen/xen-acpi-cpuhotplug.c @@ -24,10 +24,7 @@ #include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> - #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> |