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@xxxxxxxxx>
---
drivers/misc/mei/TODO | 1 -
drivers/misc/mei/init.c | 2 +-
drivers/misc/mei/interface.c | 2 +-
drivers/misc/mei/interface.h | 2 +-
drivers/misc/mei/interrupt.c | 2 +-
drivers/misc/mei/iorw.c | 2 +-
drivers/misc/mei/main.c | 2 +-
drivers/misc/mei/mei-amt-version.c | 2 +-
drivers/misc/mei/mei_dev.h | 2 +-
drivers/misc/mei/wd.c | 2 +-
include/linux/Kbuild | 1 +
{drivers/misc/mei => include/linux}/mei.h | 0
12 files changed, 10 insertions(+), 10 deletions(-)
rename {drivers/misc/mei => include/linux}/mei.h (100%)
diff --git a/drivers/misc/mei/TODO b/drivers/misc/mei/TODO
index fc26601..ed4d16c 100644
--- 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 afb0a58..a7d0bb0 100644
--- 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 9a2cfaf..428d21e 100644
--- 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 0d00435..ddff5d1 100644
--- 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 2007d24..93936f1 100644
--- 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 0a80dc4..f9cced6 100644
--- 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 6510c5a..c703332 100644
--- 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 ac2a507..01804f2 100644
--- 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 10b1b4e..63d7ee9 100644
--- 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 1e62851..6be5605 100644
--- 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 137dd4b..b344a66 100644
--- 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
--
1.7.4.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
