diff options
| author |   Tomas Winkler <tomas.winkler@intel.com> | 2012-12-25 19:06:03 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 10:31:28 -0800 |
| commit | 47a73801f498883ea3acccb8f6ff1b5c7a3553de (patch) | |
| tree | 2040bce23f8409f6d4cf046d6ba361f5c49131cf | |
| parent | mei: extract device dependent constants into hw-me.h (diff) | |
| download | linux-dev-47a73801f498883ea3acccb8f6ff1b5c7a3553de.tar.xz linux-dev-47a73801f498883ea3acccb8f6ff1b5c7a3553de.zip | |
mei: include local headers after the system ones
first include linux/mei.h then only local headers
to avoid possible false dependencies
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/mei/amthif.c | 3 | ||||
| -rw-r--r-- | drivers/misc/mei/init.c | 4 | ||||
| -rw-r--r-- | drivers/misc/mei/interface.c | 3 | ||||
| -rw-r--r-- | drivers/misc/mei/interrupt.c | 4 | ||||
| -rw-r--r-- | drivers/misc/mei/iorw.c | 4 | ||||
| -rw-r--r-- | drivers/misc/mei/main.c | 3 | ||||
| -rw-r--r-- | drivers/misc/mei/wd.c | 4 |
7 files changed, 13 insertions, 12 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index 77acd2349b1b..bb613f733309 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c @@ -31,10 +31,9 @@ #include <linux/jiffies.h> #include <linux/uaccess.h> +#include <linux/mei.h> #include "mei_dev.h" -#include "hw.h" -#include <linux/mei.h> #include "interface.h" const uuid_le mei_amthi_guid = UUID_LE(0x12f80028, 0xb4b7, 0x4b2d, 0xac, diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index c0c0b3e22579..08884ef13f31 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c @@ -19,10 +19,10 @@ #include <linux/wait.h> #include <linux/delay.h> +#include <linux/mei.h> + #include "mei_dev.h" -#include "hw.h" #include "interface.h" -#include <linux/mei.h> const char *mei_dev_state_str(int state) { diff --git a/drivers/misc/mei/interface.c b/drivers/misc/mei/interface.c index 17d93f71d6bf..810431e30cd2 100644 --- a/drivers/misc/mei/interface.c +++ b/drivers/misc/mei/interface.c @@ -15,8 +15,9 @@ */ #include <linux/pci.h> -#include "mei_dev.h" #include <linux/mei.h> + +#include "mei_dev.h" #include "interface.h" diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index fe93d1c9c242..0a020ad92f00 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c @@ -21,9 +21,9 @@ #include <linux/fs.h> #include <linux/jiffies.h> -#include "mei_dev.h" #include <linux/mei.h> -#include "hw.h" + +#include "mei_dev.h" #include "interface.h" diff --git a/drivers/misc/mei/iorw.c b/drivers/misc/mei/iorw.c index eb93a1b53b9b..7ccc3d8a079e 100644 --- a/drivers/misc/mei/iorw.c +++ b/drivers/misc/mei/iorw.c @@ -33,9 +33,9 @@ #include <linux/uaccess.h> -#include "mei_dev.h" -#include "hw.h" #include <linux/mei.h> + +#include "mei_dev.h" #include "interface.h" /** diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 7751b58540ac..da9426054815 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c @@ -37,8 +37,9 @@ #include <linux/interrupt.h> #include <linux/miscdevice.h> -#include "mei_dev.h" #include <linux/mei.h> + +#include "mei_dev.h" #include "interface.h" /* AMT device is a singleton on the platform */ diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c index 9d4d4aa0f0e8..9c3738a4eb08 100644 --- a/drivers/misc/mei/wd.c +++ b/drivers/misc/mei/wd.c @@ -21,10 +21,10 @@ #include <linux/sched.h> #include <linux/watchdog.h> +#include <linux/mei.h> + #include "mei_dev.h" -#include "hw.h" #include "interface.h" -#include <linux/mei.h> static const u8 mei_start_wd_params[] = { 0x02, 0x12, 0x13, 0x10 }; static const u8 mei_stop_wd_params[] = { 0x02, 0x02, 0x14, 0x10 }; |