---

yaml --- r: 304606 b: refs/heads/master c: 4f3afe1 h: refs/heads/master v: v3
git-mirror · May 9, 2012 · 3a79a6e · 3a79a6e
1 parent d3797b0
commit 3a79a6e
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b544f3fd3ac509850f8f1c28b302ae4e65b88346
+refs/heads/master: 4f3afe1d8c8e5dc41bb5820c01b4f3cfc2dc1205
diff --git a/trunk/drivers/misc/mei/TODO b/trunk/drivers/misc/mei/TODO
@@ -1,7 +1,6 @@
 TODO:
 	- Cleanup and split the timer function
 Upon Unstaging:
-	- move mei.h to include/linux/mei.h
 	- Documentation/ioctl/ioctl-number.txt
 	- move mei.txt under Documentation/mei/
 	- move mei-amt-version.c under Documentation/mei

diff --git a/trunk/drivers/misc/mei/init.c b/trunk/drivers/misc/mei/init.c
@@ -22,7 +22,7 @@
 #include "mei_dev.h"
 #include "hw.h"
 #include "interface.h"
-#include "mei.h"
+#include <linux/mei.h>
 
 const uuid_le mei_amthi_guid  = UUID_LE(0x12f80028, 0xb4b7, 0x4b2d, 0xac,
 						0xa8, 0x46, 0xe0, 0xff, 0x65,

diff --git a/trunk/drivers/misc/mei/interface.c b/trunk/drivers/misc/mei/interface.c
@@ -16,7 +16,7 @@
 
 #include <linux/pci.h>
 #include "mei_dev.h"
-#include "mei.h"
+#include <linux/mei.h>
 #include "interface.h"
 
 

diff --git a/trunk/drivers/misc/mei/interface.h b/trunk/drivers/misc/mei/interface.h
@@ -19,7 +19,7 @@
 #ifndef _MEI_INTERFACE_H_
 #define _MEI_INTERFACE_H_
 
-#include "mei.h"
+#include <linux/mei.h>
 #include "mei_dev.h"
 
 

diff --git a/trunk/drivers/misc/mei/interrupt.c b/trunk/drivers/misc/mei/interrupt.c
@@ -22,7 +22,7 @@
 #include <linux/jiffies.h>
 
 #include "mei_dev.h"
-#include "mei.h"
+#include <linux/mei.h>
 #include "hw.h"
 #include "interface.h"
 

diff --git a/trunk/drivers/misc/mei/iorw.c b/trunk/drivers/misc/mei/iorw.c
@@ -35,7 +35,7 @@
 
 #include "mei_dev.h"
 #include "hw.h"
-#include "mei.h"
+#include <linux/mei.h>
 #include "interface.h"
 
 

diff --git a/trunk/drivers/misc/mei/main.c b/trunk/drivers/misc/mei/main.c
@@ -38,7 +38,7 @@
 #include <linux/miscdevice.h>
 
 #include "mei_dev.h"
-#include "mei.h"
+#include <linux/mei.h>
 #include "interface.h"
 
 static const char mei_driver_name[] = "mei";

diff --git a/trunk/drivers/misc/mei/mei-amt-version.c b/trunk/drivers/misc/mei/mei-amt-version.c
@@ -74,7 +74,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <bits/wordsize.h>
-#include "mei.h"
+#include <linux/mei.h>
 
 /*****************************************************************************
  * Intel Management Engine Interface

diff --git a/trunk/drivers/misc/mei/mei_dev.h b/trunk/drivers/misc/mei/mei_dev.h
@@ -19,7 +19,7 @@
 
 #include <linux/types.h>
 #include <linux/watchdog.h>
-#include "mei.h"
+#include <linux/mei.h>
 #include "hw.h"
 
 /*

diff --git a/trunk/drivers/misc/mei/wd.c b/trunk/drivers/misc/mei/wd.c
@@ -24,7 +24,7 @@
 #include "mei_dev.h"
 #include "hw.h"
 #include "interface.h"
-#include "mei.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 };

diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
@@ -240,6 +240,7 @@ header-y += map_to_7segment.h
 header-y += matroxfb.h
 header-y += mdio.h
 header-y += media.h
+header-y += mei.h
 header-y += mempolicy.h
 header-y += meye.h
 header-y += mii.h

diff --git a/trunk/drivers/misc/mei/mei.h → trunk/include/linux/mei.h b/trunk/drivers/misc/mei/mei.h → trunk/include/linux/mei.h