Staging: mei: move the mei code out of staging

It's been cleaned up, and there's nothing else left to do, so move it
out of staging into drivers/misc/ where all can use it now.

Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Oren Weil <oren.jer.weil@intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

19 files changed, 2 insertions, 3 deletions

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index c7795096d43..c9104282ec9 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -506,4 +506,5 @@ source "drivers/misc/ti-st/Kconfig"
 source "drivers/misc/lis3lv02d/Kconfig"
 source "drivers/misc/carma/Kconfig"
 source "drivers/misc/altera-stapl/Kconfig"
+source "drivers/misc/mei/Kconfig"
 endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 3e1d80106f0..0f6af6a1334 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -49,3 +49,4 @@ obj-y				+= carma/
 obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
 obj-$(CONFIG_ALTERA_STAPL)	+=altera-stapl/
 obj-$(CONFIG_MAX8997_MUIC)	+= max8997-muic.o
+obj-$(CONFIG_INTEL_MEI)		+= mei/
diff --git a/drivers/staging/mei/Kconfig b/drivers/misc/mei/Kconfig
index 47d78a72db2..47d78a72db2 100644
--- a/drivers/staging/mei/Kconfig
+++ b/drivers/misc/mei/Kconfig
diff --git a/drivers/staging/mei/Makefile b/drivers/misc/mei/Makefile
index 57168db6c7e..57168db6c7e 100644
--- a/drivers/staging/mei/Makefile
+++ b/drivers/misc/mei/Makefile
diff --git a/drivers/staging/mei/TODO b/drivers/misc/mei/TODO
index fc266018355..fc266018355 100644
--- a/drivers/staging/mei/TODO
+++ b/drivers/misc/mei/TODO
diff --git a/drivers/staging/mei/hw.h b/drivers/misc/mei/hw.h
index 24c4c962819..24c4c962819 100644
--- a/drivers/staging/mei/hw.h
+++ b/drivers/misc/mei/hw.h
diff --git a/drivers/staging/mei/init.c b/drivers/misc/mei/init.c
index afb0a583b56..afb0a583b56 100644
--- a/drivers/staging/mei/init.c
+++ b/drivers/misc/mei/init.c
diff --git a/drivers/staging/mei/interface.c b/drivers/misc/mei/interface.c
index 9a2cfafc52a..9a2cfafc52a 100644
--- a/drivers/staging/mei/interface.c
+++ b/drivers/misc/mei/interface.c
diff --git a/drivers/staging/mei/interface.h b/drivers/misc/mei/interface.h
index 0d0043575a2..0d0043575a2 100644
--- a/drivers/staging/mei/interface.h
+++ b/drivers/misc/mei/interface.h
diff --git a/drivers/staging/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 2007d2447b1..2007d2447b1 100644
--- a/drivers/staging/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
diff --git a/drivers/staging/mei/iorw.c b/drivers/misc/mei/iorw.c
index 0a80dc4e62f..0a80dc4e62f 100644
--- a/drivers/staging/mei/iorw.c
+++ b/drivers/misc/mei/iorw.c
diff --git a/drivers/staging/mei/main.c b/drivers/misc/mei/main.c
index 20f80dfcf31..20f80dfcf31 100644
--- a/drivers/staging/mei/main.c
+++ b/drivers/misc/mei/main.c
diff --git a/drivers/staging/mei/mei-amt-version.c b/drivers/misc/mei/mei-amt-version.c
index ac2a507be25..ac2a507be25 100644
--- a/drivers/staging/mei/mei-amt-version.c
+++ b/drivers/misc/mei/mei-amt-version.c
diff --git a/drivers/staging/mei/mei.h b/drivers/misc/mei/mei.h
index bc0d8b69c49..bc0d8b69c49 100644
--- a/drivers/staging/mei/mei.h
+++ b/drivers/misc/mei/mei.h
diff --git a/drivers/staging/mei/mei.txt b/drivers/misc/mei/mei.txt
index 2785697da59..2785697da59 100644
--- a/drivers/staging/mei/mei.txt
+++ b/drivers/misc/mei/mei.txt
diff --git a/drivers/staging/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 10b1b4e2f8a..10b1b4e2f8a 100644
--- a/drivers/staging/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
diff --git a/drivers/staging/mei/wd.c b/drivers/misc/mei/wd.c
index 1e6285127e9..1e6285127e9 100644
--- a/drivers/staging/mei/wd.c
+++ b/drivers/misc/mei/wd.c
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 60221efc417..32b02e443ed 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -112,8 +112,6 @@ source "drivers/staging/cptm1217/Kconfig"
 
 source "drivers/staging/ste_rmi4/Kconfig"
 
-source "drivers/staging/mei/Kconfig"
-
 source "drivers/staging/nvec/Kconfig"
 
 source "drivers/staging/media/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 03819581fef..e603c075696 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -50,7 +50,6 @@ obj-$(CONFIG_FT1000)		+= ft1000/
 obj-$(CONFIG_SPEAKUP)		+= speakup/
 obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)	+= cptm1217/
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)	+= ste_rmi4/
-obj-$(CONFIG_INTEL_MEI)		+= mei/
 obj-$(CONFIG_MFD_NVEC)		+= nvec/
 obj-$(CONFIG_DRM_OMAP)		+= omapdrm/
 obj-$(CONFIG_ANDROID)		+= android/