summaryrefslogtreecommitdiffstats
path: root/include/acpi/acpi_bus.h
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 /include/acpi/acpi_bus.h
parent8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (diff)
parent8b48463f89429af408ff695244dc627e1acff4f7 (diff)
downloadlinux-stable-9ccad66f0171578445175ecd3bf66b35a96aaf6e.tar.gz
linux-stable-9ccad66f0171578445175ecd3bf66b35a96aaf6e.tar.bz2
linux-stable-9ccad66f0171578445175ecd3bf66b35a96aaf6e.zip
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts: drivers/acpi/scan.c
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r--include/acpi/acpi_bus.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 95831e7b70be..b241b733052e 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -28,8 +28,6 @@
#include <linux/device.h>
-#include <acpi/acpi.h>
-
/* TBD: Make dynamic */
#define ACPI_MAX_HANDLES 10
struct acpi_handle_list {