Merge branch 'acpi-cleanup' into acpi-hotplug

Conflicts: drivers/acpi/scan.c
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
parent: 8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (diff)
parent: 8b48463f89429af408ff695244dc627e1acff4f7 (diff)
35 files changed, 28 insertions, 80 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 8711e3797165..8095943e6e11 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -32,8 +32,7 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c
index a6869e110ce5..2635a01c5b3e 100644
--- a/drivers/acpi/acpi_extlog.c
+++ b/drivers/acpi/acpi_extlog.c
@@ -9,7 +9,6 @@
 #include <linux/module.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
 #include <linux/cper.h>
 #include <linux/ratelimit.h>
 #include <asm/cpu.h>
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index fc6008fbce35..65610c0e7243 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -28,8 +28,7 @@
 #include <linux/cpu.h>
 #include <linux/clockchips.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #include <asm/mwait.h>
 #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index fb57d03e698b..ca0c6d7ec0d4 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -33,7 +33,6 @@
 #include <linux/nmi.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
-#include <acpi/acpi.h>
 #include "apei-internal.h"
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index fbf1aceda8b8..e90ef8b96f26 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -36,8 +36,7 @@
 #include <linux/suspend.h>
 #include <asm/unaligned.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #include <linux/power_supply.h>
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 078c4f7fe2dd..05ee8f61bfb5 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -30,7 +30,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
 #include <linux/dmi.h>
 #include "internal.h"
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>
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index c971929d75c2..9e3a6cb99f90 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -31,8 +31,7 @@
 #include <linux/seq_file.h>
 #include <linux/input.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #include <acpi/button.h>
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
index 12b62f2cdb3f..c68e72414a67 100644
--- a/drivers/acpi/custom_method.c
+++ b/drivers/acpi/custom_method.c
@@ -7,7 +7,7 @@
 #include <linux/kernel.h>
 #include <linux/uaccess.h>
 #include <linux/debugfs.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include "internal.h"
diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c
index b55d6a20dc0e..6b1919f6bd82 100644
--- a/drivers/acpi/debugfs.c
+++ b/drivers/acpi/debugfs.c
@@ -5,7 +5,7 @@
 #include <linux/export.h>
 #include <linux/init.h>
 #include <linux/debugfs.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("debugfs");
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 @@
 #include <linux/jiffies.h>
 #include <linux/stddef.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index ba5b56db9d27..ff40120e930e 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -39,10 +39,9 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
-#include <asm/io.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include <linux/dmi.h>
+#include <asm/io.h>
 #include "internal.h"
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index cae3b387b867..ef2d730734dc 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/gfp.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index ba3da88cee45..1fb62900f32a 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -29,8 +29,7 @@
 #include <linux/types.h>
 #include <asm/uaccess.h>
 #include <linux/thermal.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c
index 13b1d39d7cdf..aafe3ca829c2 100644
--- a/drivers/acpi/hed.c
+++ b/drivers/acpi/hed.c
@@ -25,8 +25,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include <acpi/hed.h>
 static struct acpi_device_id acpi_hed_ids[] = {
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index a2343a1d9e0b..9e6816ef280a 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -29,7 +29,6 @@
 #include <linux/errno.h>
 #include <linux/acpi.h>
 #include <linux/numa.h>
-#include <acpi/acpi_bus.h>
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 5b9a785e2155..7e2d8140c334 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -49,9 +49,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/processor.h>
 #include "internal.h"
 #define _COMPONENT              ACPI_OS_SERVICES
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 41c5e1b799ef..52d45ea2bc4f 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -37,8 +37,6 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 2652a614deeb..ea6b8d16dcc8 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -39,9 +39,7 @@
 #include <linux/pci.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 2dd11e0bac24..afafee56cf8b 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -35,9 +35,7 @@
 #include <linux/pci-aspm.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
+#include <acpi/apei.h>  /* for acpi_hest_init() */
-#include <acpi/acpi_drivers.h>
-#include <acpi/apei.h>
 #include "internal.h"
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index c2ad391d8041..ad7da686e6e6 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -42,8 +42,7 @@
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
 #include <linux/sysfs.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #include "sleep.h"
 #include "internal.h"
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index 6a5b152ad4d0..db061bfd95a8 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -3,11 +3,9 @@
 #include <linux/export.h>
 #include <linux/suspend.h>
 #include <linux/bcd.h>
+#include <linux/acpi.h>
 #include <asm/uaccess.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include "sleep.h"
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index b3171f30b319..34e7b3c6a08d 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -10,8 +10,7 @@
 #include <linux/export.h>
 #include <linux/dmi.h>
 #include <linux/slab.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #include <acpi/processor.h>
 #include "internal.h"
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 644516d9bde6..d2d44e0190a3 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -35,6 +35,7 @@
 #include <linux/clockchips.h>
 #include <linux/cpuidle.h>
 #include <linux/syscore_ops.h>
+#include <acpi/processor.h>
 /*
 * Include the apic definitions for x86 to have the APIC timer related defines
@@ -46,9 +47,6 @@
 #include <asm/apic.h>
 #endif
-#include <acpi/acpi_bus.h>
-#include <acpi/processor.h>
 #define PREFIX "ACPI: "
 #define ACPI_PROCESSOR_CLASS            "processor"
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 60a7c28fc167..ff90054f04fd 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -31,15 +31,12 @@
 #include <linux/init.h>
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
+#include <linux/acpi.h>
+#include <acpi/processor.h>
 #ifdef CONFIG_X86
 #include <asm/cpufeature.h>
 #endif
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/processor.h>
 #define PREFIX "ACPI: "
 #define ACPI_PROCESSOR_CLASS            "processor"
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index d1d2e7fb5b30..f95e7584d6e6 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -30,12 +30,9 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/cpufreq.h>
+#include <linux/acpi.h>
-#include <asm/uaccess.h>
-#include <acpi/acpi_bus.h>
 #include <acpi/processor.h>
-#include <acpi/acpi_drivers.h>
+#include <asm/uaccess.h>
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index e7dd2c1fee79..28baa05b8018 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -32,14 +32,11 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/cpufreq.h>
+#include <linux/acpi.h>
+#include <acpi/processor.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-#include <acpi/processor.h>
 #define PREFIX "ACPI: "
 #define ACPI_PROCESSOR_CLASS            "processor"
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index b78bc605837e..26e5b5060523 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -8,8 +8,7 @@
 * the Free Software Foundation version 2.
 */
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
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 @@
 #include <linux/dmi.h>
 #include <linux/nls.h>
-#include <acpi/acpi_drivers.h>
 #include <asm/pgtable.h>
 #include "internal.h"
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 14df30580e15..ea9cc373ffd8 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -18,12 +18,8 @@
 #include <linux/reboot.h>
 #include <linux/acpi.h>
 #include <linux/module.h>
 #include <asm/io.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include "internal.h"
 #include "sleep.h"
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index db5293650f62..ba07d9a927ab 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -5,7 +5,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/moduleparam.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
 #include "internal.h"
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 0d9f46b5ae6d..1fd21ad69c98 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -41,10 +41,9 @@
 #include <linux/kmod.h>
 #include <linux/reboot.h>
 #include <linux/device.h>
-#include <asm/uaccess.h>
 #include <linux/thermal.h>
-#include <acpi/acpi_bus.h>
+#include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
+#include <asm/uaccess.h>
 #define PREFIX "ACPI: "
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 6d408bfbbb1d..1336b9151479 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -30,8 +30,6 @@
 #include <linux/types.h>
 #include <linux/hardirq.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include "internal.h"
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 995e91bcb97b..b727d105046d 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -37,12 +37,11 @@
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/slab.h>
-#include <asm/uaccess.h>
 #include <linux/dmi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
 #include <linux/suspend.h>
+#include <linux/acpi.h>
 #include <acpi/video.h>
+#include <asm/uaccess.h>
 #include "internal.h"
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index 7bfbe40bc43b..1638401ab282 100644
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -5,7 +5,6 @@
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_drivers.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
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
parent	8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (diff)
parent	8b48463f89429af408ff695244dc627e1acff4f7 (diff)

diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 8711e3797165..8095943e6e11 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c
@@ -32,8 +32,7 @@
32	#include <linux/delay.h>	32	#include <linux/delay.h>
33	#include <linux/platform_device.h>	33	#include <linux/platform_device.h>
34	#include <linux/power_supply.h>	34	#include <linux/power_supply.h>
35	#include <acpi/acpi_bus.h>	35	#include <linux/acpi.h>
36	#include <acpi/acpi_drivers.h>
37		36
38	#define PREFIX "ACPI: "	37	#define PREFIX "ACPI: "
39		38


diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c index a6869e110ce5..2635a01c5b3e 100644 --- a/drivers/acpi/acpi_extlog.c +++ b/drivers/acpi/acpi_extlog.c
@@ -9,7 +9,6 @@
9		9
10	#include <linux/module.h>	10	#include <linux/module.h>
11	#include <linux/acpi.h>	11	#include <linux/acpi.h>
12	#include <acpi/acpi_bus.h>
13	#include <linux/cper.h>	12	#include <linux/cper.h>
14	#include <linux/ratelimit.h>	13	#include <linux/ratelimit.h>
15	#include <asm/cpu.h>	14	#include <asm/cpu.h>


diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index fc6008fbce35..65610c0e7243 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c
@@ -28,8 +28,7 @@
28	#include <linux/cpu.h>	28	#include <linux/cpu.h>
29	#include <linux/clockchips.h>	29	#include <linux/clockchips.h>
30	#include <linux/slab.h>	30	#include <linux/slab.h>
31	#include <acpi/acpi_bus.h>	31	#include <linux/acpi.h>
32	#include <acpi/acpi_drivers.h>
33	#include <asm/mwait.h>	32	#include <asm/mwait.h>
34		33
35	#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"	34	#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"


diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index fb57d03e698b..ca0c6d7ec0d4 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c
@@ -33,7 +33,6 @@
33	#include <linux/nmi.h>	33	#include <linux/nmi.h>
34	#include <linux/delay.h>	34	#include <linux/delay.h>
35	#include <linux/mm.h>	35	#include <linux/mm.h>
36	#include <acpi/acpi.h>
37		36
38	#include "apei-internal.h"	37	#include "apei-internal.h"
39		38


diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index fbf1aceda8b8..e90ef8b96f26 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c
@@ -36,8 +36,7 @@
36	#include <linux/suspend.h>	36	#include <linux/suspend.h>
37	#include <asm/unaligned.h>	37	#include <asm/unaligned.h>
38		38
39	#include <acpi/acpi_bus.h>	39	#include <linux/acpi.h>
40	#include <acpi/acpi_drivers.h>
41	#include <linux/power_supply.h>	40	#include <linux/power_supply.h>
42		41
43	#define PREFIX "ACPI: "	42	#define PREFIX "ACPI: "


diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 078c4f7fe2dd..05ee8f61bfb5 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c
@@ -30,7 +30,6 @@
30	#include <linux/kernel.h>	30	#include <linux/kernel.h>
31	#include <linux/init.h>	31	#include <linux/init.h>
32	#include <linux/acpi.h>	32	#include <linux/acpi.h>
33	#include <acpi/acpi_bus.h>
34	#include <linux/dmi.h>	33	#include <linux/dmi.h>
35		34
36	#include "internal.h"	35	#include "internal.h"


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 @@
37	#include <asm/mpspec.h>	37	#include <asm/mpspec.h>
38	#endif	38	#endif
39	#include <linux/pci.h>	39	#include <linux/pci.h>
40	#include <acpi/acpi_bus.h>
41	#include <acpi/acpi_drivers.h>
42	#include <acpi/apei.h>	40	#include <acpi/apei.h>
43	#include <linux/dmi.h>	41	#include <linux/dmi.h>
44	#include <linux/suspend.h>	42	#include <linux/suspend.h>


diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index c971929d75c2..9e3a6cb99f90 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c
@@ -31,8 +31,7 @@
31	#include <linux/seq_file.h>	31	#include <linux/seq_file.h>
32	#include <linux/input.h>	32	#include <linux/input.h>
33	#include <linux/slab.h>	33	#include <linux/slab.h>
34	#include <acpi/acpi_bus.h>	34	#include <linux/acpi.h>
35	#include <acpi/acpi_drivers.h>
36	#include <acpi/button.h>	35	#include <acpi/button.h>
37		36
38	#define PREFIX "ACPI: "	37	#define PREFIX "ACPI: "


diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c index 12b62f2cdb3f..c68e72414a67 100644 --- a/drivers/acpi/custom_method.c +++ b/drivers/acpi/custom_method.c
@@ -7,7 +7,7 @@
7	#include <linux/kernel.h>	7	#include <linux/kernel.h>
8	#include <linux/uaccess.h>	8	#include <linux/uaccess.h>
9	#include <linux/debugfs.h>	9	#include <linux/debugfs.h>
10	#include <acpi/acpi_drivers.h>	10	#include <linux/acpi.h>
11		11
12	#include "internal.h"	12	#include "internal.h"
13		13


diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c index b55d6a20dc0e..6b1919f6bd82 100644 --- a/drivers/acpi/debugfs.c +++ b/drivers/acpi/debugfs.c
@@ -5,7 +5,7 @@
5	#include <linux/export.h>	5	#include <linux/export.h>
6	#include <linux/init.h>	6	#include <linux/init.h>
7	#include <linux/debugfs.h>	7	#include <linux/debugfs.h>
8	#include <acpi/acpi_drivers.h>	8	#include <linux/acpi.h>
9		9
10	#define _COMPONENT ACPI_SYSTEM_COMPONENT	10	#define _COMPONENT ACPI_SYSTEM_COMPONENT
11	ACPI_MODULE_NAME("debugfs");	11	ACPI_MODULE_NAME("debugfs");


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


diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index ba5b56db9d27..ff40120e930e 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c
@@ -39,10 +39,9 @@
39	#include <linux/list.h>	39	#include <linux/list.h>
40	#include <linux/spinlock.h>	40	#include <linux/spinlock.h>
41	#include <linux/slab.h>	41	#include <linux/slab.h>
42	#include <asm/io.h>	42	#include <linux/acpi.h>
43	#include <acpi/acpi_bus.h>
44	#include <acpi/acpi_drivers.h>
45	#include <linux/dmi.h>	43	#include <linux/dmi.h>
		44	#include <asm/io.h>
46		45
47	#include "internal.h"	46	#include "internal.h"
48		47


diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c index cae3b387b867..ef2d730734dc 100644 --- a/drivers/acpi/event.c +++ b/drivers/acpi/event.c
@@ -12,7 +12,7 @@
12	#include <linux/init.h>	12	#include <linux/init.h>
13	#include <linux/poll.h>	13	#include <linux/poll.h>
14	#include <linux/gfp.h>	14	#include <linux/gfp.h>
15	#include <acpi/acpi_drivers.h>	15	#include <linux/acpi.h>
16	#include <net/netlink.h>	16	#include <net/netlink.h>
17	#include <net/genetlink.h>	17	#include <net/genetlink.h>
18		18


diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index ba3da88cee45..1fb62900f32a 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c
@@ -29,8 +29,7 @@
29	#include <linux/types.h>	29	#include <linux/types.h>
30	#include <asm/uaccess.h>	30	#include <asm/uaccess.h>
31	#include <linux/thermal.h>	31	#include <linux/thermal.h>
32	#include <acpi/acpi_bus.h>	32	#include <linux/acpi.h>
33	#include <acpi/acpi_drivers.h>
34		33
35	#define PREFIX "ACPI: "	34	#define PREFIX "ACPI: "
36		35


diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c index 13b1d39d7cdf..aafe3ca829c2 100644 --- a/drivers/acpi/hed.c +++ b/drivers/acpi/hed.c
@@ -25,8 +25,6 @@
25	#include <linux/module.h>	25	#include <linux/module.h>
26	#include <linux/init.h>	26	#include <linux/init.h>
27	#include <linux/acpi.h>	27	#include <linux/acpi.h>
28	#include <acpi/acpi_bus.h>
29	#include <acpi/acpi_drivers.h>
30	#include <acpi/hed.h>	28	#include <acpi/hed.h>
31		29
32	static struct acpi_device_id acpi_hed_ids[] = {	30	static struct acpi_device_id acpi_hed_ids[] = {


diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index a2343a1d9e0b..9e6816ef280a 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c
@@ -29,7 +29,6 @@
29	#include <linux/errno.h>	29	#include <linux/errno.h>
30	#include <linux/acpi.h>	30	#include <linux/acpi.h>
31	#include <linux/numa.h>	31	#include <linux/numa.h>
32	#include <acpi/acpi_bus.h>
33		32
34	#define PREFIX "ACPI: "	33	#define PREFIX "ACPI: "
35		34


diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 5b9a785e2155..7e2d8140c334 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c
@@ -49,9 +49,6 @@
49	#include <asm/io.h>	49	#include <asm/io.h>
50	#include <asm/uaccess.h>	50	#include <asm/uaccess.h>
51		51
52	#include <acpi/acpi.h>
53	#include <acpi/acpi_bus.h>
54	#include <acpi/processor.h>
55	#include "internal.h"	52	#include "internal.h"
56		53
57	#define _COMPONENT ACPI_OS_SERVICES	54	#define _COMPONENT ACPI_OS_SERVICES


diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 41c5e1b799ef..52d45ea2bc4f 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c
@@ -37,8 +37,6 @@
37	#include <linux/pci.h>	37	#include <linux/pci.h>
38	#include <linux/acpi.h>	38	#include <linux/acpi.h>
39	#include <linux/slab.h>	39	#include <linux/slab.h>
40	#include <acpi/acpi_bus.h>
41	#include <acpi/acpi_drivers.h>
42		40
43	#define PREFIX "ACPI: "	41	#define PREFIX "ACPI: "
44		42


diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 2652a614deeb..ea6b8d16dcc8 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c
@@ -39,9 +39,7 @@
39	#include <linux/pci.h>	39	#include <linux/pci.h>
40	#include <linux/mutex.h>	40	#include <linux/mutex.h>
41	#include <linux/slab.h>	41	#include <linux/slab.h>
42		42	#include <linux/acpi.h>
43	#include <acpi/acpi_bus.h>
44	#include <acpi/acpi_drivers.h>
45		43
46	#define PREFIX "ACPI: "	44	#define PREFIX "ACPI: "
47		45


diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 2dd11e0bac24..afafee56cf8b 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c
@@ -35,9 +35,7 @@
35	#include <linux/pci-aspm.h>	35	#include <linux/pci-aspm.h>
36	#include <linux/acpi.h>	36	#include <linux/acpi.h>
37	#include <linux/slab.h>	37	#include <linux/slab.h>
38	#include <acpi/acpi_bus.h>	38	#include <acpi/apei.h> /* for acpi_hest_init() */
39	#include <acpi/acpi_drivers.h>
40	#include <acpi/apei.h>
41		39
42	#include "internal.h"	40	#include "internal.h"
43		41


diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index c2ad391d8041..ad7da686e6e6 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c
@@ -42,8 +42,7 @@
42	#include <linux/slab.h>	42	#include <linux/slab.h>
43	#include <linux/pm_runtime.h>	43	#include <linux/pm_runtime.h>
44	#include <linux/sysfs.h>	44	#include <linux/sysfs.h>
45	#include <acpi/acpi_bus.h>	45	#include <linux/acpi.h>
46	#include <acpi/acpi_drivers.h>
47	#include "sleep.h"	46	#include "sleep.h"
48	#include "internal.h"	47	#include "internal.h"
49		48


diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index 6a5b152ad4d0..db061bfd95a8 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c
@@ -3,11 +3,9 @@
3	#include <linux/export.h>	3	#include <linux/export.h>
4	#include <linux/suspend.h>	4	#include <linux/suspend.h>
5	#include <linux/bcd.h>	5	#include <linux/bcd.h>
		6	#include <linux/acpi.h>
6	#include <asm/uaccess.h>	7	#include <asm/uaccess.h>
7		8
8	#include <acpi/acpi_bus.h>
9	#include <acpi/acpi_drivers.h>
10
11	#include "sleep.h"	9	#include "sleep.h"
12		10
13	#define _COMPONENT ACPI_SYSTEM_COMPONENT	11	#define _COMPONENT ACPI_SYSTEM_COMPONENT


diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index b3171f30b319..34e7b3c6a08d 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c
@@ -10,8 +10,7 @@
10	#include <linux/export.h>	10	#include <linux/export.h>
11	#include <linux/dmi.h>	11	#include <linux/dmi.h>
12	#include <linux/slab.h>	12	#include <linux/slab.h>
13		13	#include <linux/acpi.h>
14	#include <acpi/acpi_drivers.h>
15	#include <acpi/processor.h>	14	#include <acpi/processor.h>
16		15
17	#include "internal.h"	16	#include "internal.h"


diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 644516d9bde6..d2d44e0190a3 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c
@@ -35,6 +35,7 @@
35	#include <linux/clockchips.h>	35	#include <linux/clockchips.h>
36	#include <linux/cpuidle.h>	36	#include <linux/cpuidle.h>
37	#include <linux/syscore_ops.h>	37	#include <linux/syscore_ops.h>
		38	#include <acpi/processor.h>
38		39
39	/*	40	/*
40	* Include the apic definitions for x86 to have the APIC timer related defines	41	* Include the apic definitions for x86 to have the APIC timer related defines
@@ -46,9 +47,6 @@
46	#include <asm/apic.h>	47	#include <asm/apic.h>
47	#endif	48	#endif
48		49
49	#include <acpi/acpi_bus.h>
50	#include <acpi/processor.h>
51
52	#define PREFIX "ACPI: "	50	#define PREFIX "ACPI: "
53		51
54	#define ACPI_PROCESSOR_CLASS "processor"	52	#define ACPI_PROCESSOR_CLASS "processor"


diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 60a7c28fc167..ff90054f04fd 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c
@@ -31,15 +31,12 @@
31	#include <linux/init.h>	31	#include <linux/init.h>
32	#include <linux/cpufreq.h>	32	#include <linux/cpufreq.h>
33	#include <linux/slab.h>	33	#include <linux/slab.h>
34		34	#include <linux/acpi.h>
		35	#include <acpi/processor.h>
35	#ifdef CONFIG_X86	36	#ifdef CONFIG_X86
36	#include <asm/cpufeature.h>	37	#include <asm/cpufeature.h>
37	#endif	38	#endif
38		39
39	#include <acpi/acpi_bus.h>
40	#include <acpi/acpi_drivers.h>
41	#include <acpi/processor.h>
42
43	#define PREFIX "ACPI: "	40	#define PREFIX "ACPI: "
44		41
45	#define ACPI_PROCESSOR_CLASS "processor"	42	#define ACPI_PROCESSOR_CLASS "processor"


diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index d1d2e7fb5b30..f95e7584d6e6 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c
@@ -30,12 +30,9 @@
30	#include <linux/module.h>	30	#include <linux/module.h>
31	#include <linux/init.h>	31	#include <linux/init.h>
32	#include <linux/cpufreq.h>	32	#include <linux/cpufreq.h>
33		33	#include <linux/acpi.h>
34	#include <asm/uaccess.h>
35
36	#include <acpi/acpi_bus.h>
37	#include <acpi/processor.h>	34	#include <acpi/processor.h>
38	#include <acpi/acpi_drivers.h>	35	#include <asm/uaccess.h>
39		36
40	#define PREFIX "ACPI: "	37	#define PREFIX "ACPI: "
41		38


diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index e7dd2c1fee79..28baa05b8018 100644 --- a/drivers/acpi/processor_throttling.c +++ b/drivers/acpi/processor_throttling.c
@@ -32,14 +32,11 @@
32	#include <linux/init.h>	32	#include <linux/init.h>
33	#include <linux/sched.h>	33	#include <linux/sched.h>
34	#include <linux/cpufreq.h>	34	#include <linux/cpufreq.h>
35		35	#include <linux/acpi.h>
		36	#include <acpi/processor.h>
36	#include <asm/io.h>	37	#include <asm/io.h>
37	#include <asm/uaccess.h>	38	#include <asm/uaccess.h>
38		39
39	#include <acpi/acpi_bus.h>
40	#include <acpi/acpi_drivers.h>
41	#include <acpi/processor.h>
42
43	#define PREFIX "ACPI: "	40	#define PREFIX "ACPI: "
44		41
45	#define ACPI_PROCESSOR_CLASS "processor"	42	#define ACPI_PROCESSOR_CLASS "processor"


diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c index b78bc605837e..26e5b5060523 100644 --- a/drivers/acpi/sbshc.c +++ b/drivers/acpi/sbshc.c
@@ -8,8 +8,7 @@
8	* the Free Software Foundation version 2.	8	* the Free Software Foundation version 2.
9	*/	9	*/
10		10
11	#include <acpi/acpi_bus.h>	11	#include <linux/acpi.h>
12	#include <acpi/acpi_drivers.h>
13	#include <linux/wait.h>	12	#include <linux/wait.h>
14	#include <linux/slab.h>	13	#include <linux/slab.h>
15	#include <linux/delay.h>	14	#include <linux/delay.h>


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"


diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 14df30580e15..ea9cc373ffd8 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c
@@ -18,12 +18,8 @@
18	#include <linux/reboot.h>	18	#include <linux/reboot.h>
19	#include <linux/acpi.h>	19	#include <linux/acpi.h>
20	#include <linux/module.h>	20	#include <linux/module.h>
21
22	#include <asm/io.h>	21	#include <asm/io.h>
23		22
24	#include <acpi/acpi_bus.h>
25	#include <acpi/acpi_drivers.h>
26
27	#include "internal.h"	23	#include "internal.h"
28	#include "sleep.h"	24	#include "sleep.h"
29		25


diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index db5293650f62..ba07d9a927ab 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c
@@ -5,7 +5,7 @@
5	#include <linux/init.h>	5	#include <linux/init.h>
6	#include <linux/kernel.h>	6	#include <linux/kernel.h>
7	#include <linux/moduleparam.h>	7	#include <linux/moduleparam.h>
8	#include <acpi/acpi_drivers.h>	8	#include <linux/acpi.h>
9		9
10	#include "internal.h"	10	#include "internal.h"
11		11


diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 0d9f46b5ae6d..1fd21ad69c98 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c
@@ -41,10 +41,9 @@
41	#include <linux/kmod.h>	41	#include <linux/kmod.h>
42	#include <linux/reboot.h>	42	#include <linux/reboot.h>
43	#include <linux/device.h>	43	#include <linux/device.h>
44	#include <asm/uaccess.h>
45	#include <linux/thermal.h>	44	#include <linux/thermal.h>
46	#include <acpi/acpi_bus.h>	45	#include <linux/acpi.h>
47	#include <acpi/acpi_drivers.h>	46	#include <asm/uaccess.h>
48		47
49	#define PREFIX "ACPI: "	48	#define PREFIX "ACPI: "
50		49


diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 6d408bfbbb1d..1336b9151479 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c
@@ -30,8 +30,6 @@
30	#include <linux/types.h>	30	#include <linux/types.h>
31	#include <linux/hardirq.h>	31	#include <linux/hardirq.h>
32	#include <linux/acpi.h>	32	#include <linux/acpi.h>
33	#include <acpi/acpi_bus.h>
34	#include <acpi/acpi_drivers.h>
35		33
36	#include "internal.h"	34	#include "internal.h"
37		35


diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 995e91bcb97b..b727d105046d 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c
@@ -37,12 +37,11 @@
37	#include <linux/pci.h>	37	#include <linux/pci.h>
38	#include <linux/pci_ids.h>	38	#include <linux/pci_ids.h>
39	#include <linux/slab.h>	39	#include <linux/slab.h>
40	#include <asm/uaccess.h>
41	#include <linux/dmi.h>	40	#include <linux/dmi.h>
42	#include <acpi/acpi_bus.h>
43	#include <acpi/acpi_drivers.h>
44	#include <linux/suspend.h>	41	#include <linux/suspend.h>
		42	#include <linux/acpi.h>
45	#include <acpi/video.h>	43	#include <acpi/video.h>
		44	#include <asm/uaccess.h>
46		45
47	#include "internal.h"	46	#include "internal.h"
48		47


diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c index 7bfbe40bc43b..1638401ab282 100644 --- a/drivers/acpi/wakeup.c +++ b/drivers/acpi/wakeup.c
@@ -5,7 +5,6 @@
5		5
6	#include <linux/init.h>	6	#include <linux/init.h>
7	#include <linux/acpi.h>	7	#include <linux/acpi.h>
8	#include <acpi/acpi_drivers.h>
9	#include <linux/kernel.h>	8	#include <linux/kernel.h>
10	#include <linux/types.h>	9	#include <linux/types.h>
11		10