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/pci/hotplug/acpiphp_ibm.c | |
parent | 8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (diff) | |
parent | 8b48463f89429af408ff695244dc627e1acff4f7 (diff) |
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts:
drivers/acpi/scan.c
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_ibm.c')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_ibm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c index ecfac7e72d9..8dcccffd6e2 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c @@ -31,12 +31,11 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> -#include <asm/uaccess.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <asm/uaccess.h> #include "acpiphp.h" #include "../pci.h" |