summaryrefslogtreecommitdiff
path: root/drivers/xen/xen-acpi-memhotplug.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 04:05:17 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 04:05:17 +0400
commit9ccad66f0171578445175ecd3bf66b35a96aaf6e (patch)
tree78c1be21493ef183de9444cf0d2bfb1e729b0698 /drivers/xen/xen-acpi-memhotplug.c
parent8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (diff)
parent8b48463f89429af408ff695244dc627e1acff4f7 (diff)
downloadlinux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.tar.xz
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts: drivers/acpi/scan.c
Diffstat (limited to 'drivers/xen/xen-acpi-memhotplug.c')
-rw-r--r--drivers/xen/xen-acpi-memhotplug.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/xen/xen-acpi-memhotplug.c b/drivers/xen/xen-acpi-memhotplug.c
index 9b056f06691f..f8d18626969a 100644
--- a/drivers/xen/xen-acpi-memhotplug.c
+++ b/drivers/xen/xen-acpi-memhotplug.c
@@ -22,7 +22,6 @@
#include <linux/init.h>
#include <linux/types.h>
#include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
#include <xen/acpi.h>
#include <xen/interface/platform.h>
#include <asm/xen/hypercall.h>