diff options
-rw-r--r-- | drivers/misc/mei/amthif.c | 2 | ||||
-rw-r--r-- | drivers/misc/mei/bus.c | 1 | ||||
-rw-r--r-- | drivers/misc/mei/client.c | 2 | ||||
-rw-r--r-- | drivers/misc/mei/debugfs.c | 1 | ||||
-rw-r--r-- | drivers/misc/mei/hbm.c | 5 | ||||
-rw-r--r-- | drivers/misc/mei/init.c | 1 | ||||
-rw-r--r-- | drivers/misc/mei/interrupt.c | 2 | ||||
-rw-r--r-- | drivers/misc/mei/main.c | 2 | ||||
-rw-r--r-- | drivers/misc/mei/nfc.c | 3 | ||||
-rw-r--r-- | drivers/misc/mei/wd.c | 1 | ||||
-rw-r--r-- | include/linux/mei_cl_bus.h | 1 |
11 files changed, 10 insertions, 11 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index 5d47d1b36ccf..d9b0e761fcd2 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
21 | #include <linux/fcntl.h> | 21 | #include <linux/fcntl.h> |
22 | #include <linux/aio.h> | 22 | #include <linux/aio.h> |
23 | #include <linux/pci.h> | ||
24 | #include <linux/ioctl.h> | 23 | #include <linux/ioctl.h> |
25 | #include <linux/cdev.h> | 24 | #include <linux/cdev.h> |
26 | #include <linux/list.h> | 25 | #include <linux/list.h> |
@@ -29,6 +28,7 @@ | |||
29 | #include <linux/uuid.h> | 28 | #include <linux/uuid.h> |
30 | #include <linux/jiffies.h> | 29 | #include <linux/jiffies.h> |
31 | #include <linux/uaccess.h> | 30 | #include <linux/uaccess.h> |
31 | #include <linux/slab.h> | ||
32 | 32 | ||
33 | #include <linux/mei.h> | 33 | #include <linux/mei.h> |
34 | 34 | ||
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c index 4cc1a66187be..4d20d60ca38d 100644 --- a/drivers/misc/mei/bus.c +++ b/drivers/misc/mei/bus.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
23 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |
24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
25 | #include <linux/pci.h> | ||
26 | #include <linux/mei_cl_bus.h> | 25 | #include <linux/mei_cl_bus.h> |
27 | 26 | ||
28 | #include "mei_dev.h" | 27 | #include "mei_dev.h" |
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c index bfc3ad24db9c..04a196429e55 100644 --- a/drivers/misc/mei/client.c +++ b/drivers/misc/mei/client.c | |||
@@ -14,10 +14,10 @@ | |||
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/pci.h> | ||
18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
19 | #include <linux/wait.h> | 18 | #include <linux/wait.h> |
20 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
20 | #include <linux/slab.h> | ||
21 | #include <linux/pm_runtime.h> | 21 | #include <linux/pm_runtime.h> |
22 | 22 | ||
23 | #include <linux/mei.h> | 23 | #include <linux/mei.h> |
diff --git a/drivers/misc/mei/debugfs.c b/drivers/misc/mei/debugfs.c index e14a7db9a669..aca7847da69f 100644 --- a/drivers/misc/mei/debugfs.c +++ b/drivers/misc/mei/debugfs.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/device.h> | 18 | #include <linux/device.h> |
19 | #include <linux/debugfs.h> | 19 | #include <linux/debugfs.h> |
20 | #include <linux/pci.h> | ||
21 | 20 | ||
22 | #include <linux/mei.h> | 21 | #include <linux/mei.h> |
23 | 22 | ||
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c index 209650bccf57..c874fdd44ce1 100644 --- a/drivers/misc/mei/hbm.c +++ b/drivers/misc/mei/hbm.c | |||
@@ -15,11 +15,12 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/export.h> | 17 | #include <linux/export.h> |
18 | #include <linux/pci.h> | ||
19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
20 | #include <linux/wait.h> | 19 | #include <linux/wait.h> |
21 | #include <linux/mei.h> | ||
22 | #include <linux/pm_runtime.h> | 20 | #include <linux/pm_runtime.h> |
21 | #include <linux/slab.h> | ||
22 | |||
23 | #include <linux/mei.h> | ||
23 | 24 | ||
24 | #include "mei_dev.h" | 25 | #include "mei_dev.h" |
25 | #include "hbm.h" | 26 | #include "hbm.h" |
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index dd233fd43178..76ef8ffa42c1 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c | |||
@@ -15,7 +15,6 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/export.h> | 17 | #include <linux/export.h> |
18 | #include <linux/pci.h> | ||
19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
20 | #include <linux/wait.h> | 19 | #include <linux/wait.h> |
21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index 8dac76901130..8844e1772793 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c | |||
@@ -16,11 +16,11 @@ | |||
16 | 16 | ||
17 | 17 | ||
18 | #include <linux/export.h> | 18 | #include <linux/export.h> |
19 | #include <linux/pci.h> | ||
20 | #include <linux/kthread.h> | 19 | #include <linux/kthread.h> |
21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
22 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
23 | #include <linux/jiffies.h> | 22 | #include <linux/jiffies.h> |
23 | #include <linux/slab.h> | ||
24 | 24 | ||
25 | #include <linux/mei.h> | 25 | #include <linux/mei.h> |
26 | 26 | ||
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 4d738c881878..d31f271f6516 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c | |||
@@ -17,12 +17,12 @@ | |||
17 | #include <linux/moduleparam.h> | 17 | #include <linux/moduleparam.h> |
18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
19 | #include <linux/device.h> | 19 | #include <linux/device.h> |
20 | #include <linux/slab.h> | ||
20 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
21 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
22 | #include <linux/types.h> | 23 | #include <linux/types.h> |
23 | #include <linux/fcntl.h> | 24 | #include <linux/fcntl.h> |
24 | #include <linux/aio.h> | 25 | #include <linux/aio.h> |
25 | #include <linux/pci.h> | ||
26 | #include <linux/poll.h> | 26 | #include <linux/poll.h> |
27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
28 | #include <linux/ioctl.h> | 28 | #include <linux/ioctl.h> |
diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c index 9f32fd6eaccf..5b369f4c47de 100644 --- a/drivers/misc/mei/nfc.c +++ b/drivers/misc/mei/nfc.c | |||
@@ -19,7 +19,8 @@ | |||
19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
20 | #include <linux/moduleparam.h> | 20 | #include <linux/moduleparam.h> |
21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
22 | #include <linux/pci.h> | 22 | #include <linux/slab.h> |
23 | |||
23 | #include <linux/mei_cl_bus.h> | 24 | #include <linux/mei_cl_bus.h> |
24 | 25 | ||
25 | #include "mei_dev.h" | 26 | #include "mei_dev.h" |
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c index d28511b78eaa..626b4c13993b 100644 --- a/drivers/misc/mei/wd.c +++ b/drivers/misc/mei/wd.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/moduleparam.h> | 18 | #include <linux/moduleparam.h> |
19 | #include <linux/device.h> | 19 | #include <linux/device.h> |
20 | #include <linux/pci.h> | ||
21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
22 | #include <linux/watchdog.h> | 21 | #include <linux/watchdog.h> |
23 | 22 | ||
diff --git a/include/linux/mei_cl_bus.h b/include/linux/mei_cl_bus.h index d14af7b722ef..164aad1f9f12 100644 --- a/include/linux/mei_cl_bus.h +++ b/include/linux/mei_cl_bus.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/device.h> | 4 | #include <linux/device.h> |
5 | #include <linux/uuid.h> | 5 | #include <linux/uuid.h> |
6 | #include <linux/mod_devicetable.h> | ||
6 | 7 | ||
7 | struct mei_cl_device; | 8 | struct mei_cl_device; |
8 | 9 | ||