summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpi_video.c2
-rw-r--r--drivers/acpi/battery.c2
-rw-r--r--drivers/acpi/osl.c2
-rw-r--r--drivers/acpi/proc.c2
-rw-r--r--drivers/acpi/processor_thermal.c2
-rw-r--r--drivers/acpi/processor_throttling.c2
-rw-r--r--drivers/acpi/thermal.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index 201292e67ee8..d00bc0ef87a6 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -37,7 +37,7 @@
37#include <linux/suspend.h> 37#include <linux/suspend.h>
38#include <linux/acpi.h> 38#include <linux/acpi.h>
39#include <acpi/video.h> 39#include <acpi/video.h>
40#include <asm/uaccess.h> 40#include <linux/uaccess.h>
41 41
42#define PREFIX "ACPI: " 42#define PREFIX "ACPI: "
43 43
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 05fe9ebfb9b5..4ef1e4624b2b 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -36,7 +36,7 @@
36#ifdef CONFIG_ACPI_PROCFS_POWER 36#ifdef CONFIG_ACPI_PROCFS_POWER
37#include <linux/proc_fs.h> 37#include <linux/proc_fs.h>
38#include <linux/seq_file.h> 38#include <linux/seq_file.h>
39#include <asm/uaccess.h> 39#include <linux/uaccess.h>
40#endif 40#endif
41 41
42#include <linux/acpi.h> 42#include <linux/acpi.h>
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index a404ff4d7151..57fb5f468ac2 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -42,7 +42,7 @@
42#include <linux/semaphore.h> 42#include <linux/semaphore.h>
43 43
44#include <asm/io.h> 44#include <asm/io.h>
45#include <asm/uaccess.h> 45#include <linux/uaccess.h>
46#include <linux/io-64-nonatomic-lo-hi.h> 46#include <linux/io-64-nonatomic-lo-hi.h>
47 47
48#include "internal.h" 48#include "internal.h"
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index 2a358154b770..a34669cc823b 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -4,7 +4,7 @@
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 <linux/acpi.h>
7#include <asm/uaccess.h> 7#include <linux/uaccess.h>
8 8
9#include "sleep.h" 9#include "sleep.h"
10#include "internal.h" 10#include "internal.h"
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index 1fed84a092c2..59c3a5d1e600 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -28,7 +28,7 @@
28#include <linux/cpufreq.h> 28#include <linux/cpufreq.h>
29#include <linux/acpi.h> 29#include <linux/acpi.h>
30#include <acpi/processor.h> 30#include <acpi/processor.h>
31#include <asm/uaccess.h> 31#include <linux/uaccess.h>
32 32
33#define PREFIX "ACPI: " 33#define PREFIX "ACPI: "
34 34
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index d51ca1c05619..a12f96cc93ff 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -31,7 +31,7 @@
31#include <linux/acpi.h> 31#include <linux/acpi.h>
32#include <acpi/processor.h> 32#include <acpi/processor.h>
33#include <asm/io.h> 33#include <asm/io.h>
34#include <asm/uaccess.h> 34#include <linux/uaccess.h>
35 35
36#define PREFIX "ACPI: " 36#define PREFIX "ACPI: "
37 37
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 35e8fbca10ad..1d0417b87cb7 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -40,7 +40,7 @@
40#include <linux/thermal.h> 40#include <linux/thermal.h>
41#include <linux/acpi.h> 41#include <linux/acpi.h>
42#include <linux/workqueue.h> 42#include <linux/workqueue.h>
43#include <asm/uaccess.h> 43#include <linux/uaccess.h>
44 44
45#define PREFIX "ACPI: " 45#define PREFIX "ACPI: "
46 46