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/scan.c | |
| parent | 8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (diff) | |
| parent | 8b48463f89429af408ff695244dc627e1acff4f7 (diff) | |
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts:
drivers/acpi/scan.c
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 311904c720b1..5383c81a8a1b 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | #include <linux/dmi.h> | 12 | #include <linux/dmi.h> |
| 13 | #include <linux/nls.h> | 13 | #include <linux/nls.h> |
| 14 | 14 | ||
| 15 | #include <acpi/acpi_drivers.h> | ||
| 16 | |||
| 17 | #include <asm/pgtable.h> | 15 | #include <asm/pgtable.h> |
| 18 | 16 | ||
| 19 | #include "internal.h" | 17 | #include "internal.h" |