Skip to content

Commit

Permalink
mei: include local headers after the system ones
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 66ef5ea commit 47a7380
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
3 changes: 1 addition & 2 deletions drivers/misc/mei/amthif.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions drivers/misc/mei/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
3 changes: 2 additions & 1 deletion drivers/misc/mei/interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
*/

#include <linux/pci.h>
#include "mei_dev.h"
#include <linux/mei.h>

#include "mei_dev.h"
#include "interface.h"


Expand Down
4 changes: 2 additions & 2 deletions drivers/misc/mei/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down
4 changes: 2 additions & 2 deletions drivers/misc/mei/iorw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/**
Expand Down
3 changes: 2 additions & 1 deletion drivers/misc/mei/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions drivers/misc/mei/wd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
Expand Down

0 comments on commit 47a7380

Please sign in to comment.