diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-06 19:05:17 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-06 19:05:17 -0500 |
| commit | 9ccad66f0171578445175ecd3bf66b35a96aaf6e (patch) | |
| tree | 78c1be21493ef183de9444cf0d2bfb1e729b0698 /drivers/acpi/dock.c | |
| parent | 8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (diff) | |
| parent | 8b48463f89429af408ff695244dc627e1acff4f7 (diff) | |
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts:
drivers/acpi/scan.c
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index de032010da3c..8da6be99ba42 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
| @@ -32,8 +32,6 @@ | |||
| 32 | #include <linux/jiffies.h> | 32 | #include <linux/jiffies.h> |
| 33 | #include <linux/stddef.h> | 33 | #include <linux/stddef.h> |
| 34 | #include <linux/acpi.h> | 34 | #include <linux/acpi.h> |
| 35 | #include <acpi/acpi_bus.h> | ||
| 36 | #include <acpi/acpi_drivers.h> | ||
| 37 | 35 | ||
| 38 | #define PREFIX "ACPI: " | 36 | #define PREFIX "ACPI: " |
| 39 | 37 | ||