mei: export mei.h for the user space

The header exports API for application layer

1. move under include/linux and add to  the export list
2. update include path n the sources
3. update TODO

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/mei/TODO b/drivers/misc/mei/TODO
index fc266018355ec7ad2d88658c0dfdee3d66abfa31..ed4d16c30ab52843a802d8240d399f75cb81cb5c 100644 (file)
--- a/drivers/misc/mei/TODO
+++ b/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/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index afb0a583b5665a1b032cac2391c115678ddc6577..a7d0bb0880ece4c4319eac1cd4f6fbe64c358d55 100644 (file)
--- a/drivers/misc/mei/init.c
+++ b/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/drivers/misc/mei/interface.c b/drivers/misc/mei/interface.c
index 9a2cfafc52a644d1e5f6c6a18006389e0962e2b1..428d21e364160f0002a1ccb5e07c01fb42c94c41 100644 (file)
--- a/drivers/misc/mei/interface.c
+++ b/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/drivers/misc/mei/interface.h b/drivers/misc/mei/interface.h
index 0d0043575a2a33b9c37a455eb9983e91b6b41b86..ddff5d16616fe80bf4bab59c21c06c0695d26f28 100644 (file)
--- a/drivers/misc/mei/interface.h
+++ b/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/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 2007d2447b1c83b42a7d6be2d812b4d78d473d3b..93936f1b75eb1d89ac47a75284eebc3f1504df15 100644 (file)
--- a/drivers/misc/mei/interrupt.c
+++ b/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/drivers/misc/mei/iorw.c b/drivers/misc/mei/iorw.c
index 0a80dc4e62f3c3cc702e720d223bc0c14393ed70..f9cced69b65e79d388405285eb9c010cac58c6f0 100644 (file)
--- a/drivers/misc/mei/iorw.c
+++ b/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/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 6510c5adac2a3027f8a88a0541cc9b7b871e481b..c70333228337d28bc76d1c61510bb57b615d3a68 100644 (file)
--- a/drivers/misc/mei/main.c
+++ b/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/drivers/misc/mei/mei-amt-version.c b/drivers/misc/mei/mei-amt-version.c
index ac2a507be253c672e21bdfaee018fade352f0ed9..01804f21631293b796a113319c202d2593330b5e 100644 (file)
--- a/drivers/misc/mei/mei-amt-version.c
+++ b/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/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 10b1b4e2f8ac9e65dded0f48a0f9e65631a30ebb..63d7ee97c5fbd9532176481fcdd4b92a5b8a06ad 100644 (file)
--- a/drivers/misc/mei/mei_dev.h
+++ b/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/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index 1e6285127e950be32874039d404e8fb2fdb163f2..6be5605707b46036c433a7e8e441eb8b4ee1ccca 100644 (file)
--- a/drivers/misc/mei/wd.c
+++ b/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/include/linux/Kbuild b/include/linux/Kbuild
index 137dd4bb4ba73667626f5f76f7aa7fcc8e54805d..b344a664c1f12e7ee1e3465056b4a106917888d7 100644 (file)
--- a/include/linux/Kbuild
+++ b/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/drivers/misc/mei/mei.h b/include/linux/mei.h
similarity index 100%
rename from drivers/misc/mei/mei.h
rename to include/linux/mei.h