diff options
author | 2013-12-07 01:05:17 +0100 | |
---|---|---|
committer | 2013-12-07 01:05:17 +0100 | |
commit | 9ccad66f0171578445175ecd3bf66b35a96aaf6e (patch) | |
tree | 78c1be21493ef183de9444cf0d2bfb1e729b0698 /drivers/acpi/bus.c | |
parent | Merge branch 'acpi-pci-hotplug' into acpi-hotplug (diff) | |
parent | ACPI: Clean up inclusions of ACPI header files (diff) | |
download | linux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.tar.gz linux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.tar.bz2 linux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.zip |
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.c | 2 |
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> |