summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/bus.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 01:05:17 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 01:05:17 +0100
commit9ccad66f0171578445175ecd3bf66b35a96aaf6e (patch)
tree78c1be21493ef183de9444cf0d2bfb1e729b0698 /drivers/acpi/bus.c
parent8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (diff)
parent8b48463f89429af408ff695244dc627e1acff4f7 (diff)
downloadlinux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.tar.bz2
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts: drivers/acpi/scan.c
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r--drivers/acpi/bus.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index f509019ee2c7..2c38ae22c17f 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -37,8 +37,6 @@
#include <asm/mpspec.h>
#endif
#include <linux/pci.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
#include <acpi/apei.h>
#include <linux/dmi.h>
#include <linux/suspend.h>