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>
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index c779509..c910428 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -506,4 +506,5 @@
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 3e1d801..0f6af6a 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -49,3 +49,4 @@
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
similarity index 100%
rename from drivers/staging/mei/Kconfig
rename to drivers/misc/mei/Kconfig
diff --git a/drivers/staging/mei/Makefile b/drivers/misc/mei/Makefile
similarity index 100%
rename from drivers/staging/mei/Makefile
rename to drivers/misc/mei/Makefile
diff --git a/drivers/staging/mei/TODO b/drivers/misc/mei/TODO
similarity index 100%
rename from drivers/staging/mei/TODO
rename to drivers/misc/mei/TODO
diff --git a/drivers/staging/mei/hw.h b/drivers/misc/mei/hw.h
similarity index 100%
rename from drivers/staging/mei/hw.h
rename to drivers/misc/mei/hw.h
diff --git a/drivers/staging/mei/init.c b/drivers/misc/mei/init.c
similarity index 100%
rename from drivers/staging/mei/init.c
rename to drivers/misc/mei/init.c
diff --git a/drivers/staging/mei/interface.c b/drivers/misc/mei/interface.c
similarity index 100%
rename from drivers/staging/mei/interface.c
rename to drivers/misc/mei/interface.c
diff --git a/drivers/staging/mei/interface.h b/drivers/misc/mei/interface.h
similarity index 100%
rename from drivers/staging/mei/interface.h
rename to drivers/misc/mei/interface.h
diff --git a/drivers/staging/mei/interrupt.c b/drivers/misc/mei/interrupt.c
similarity index 100%
rename from drivers/staging/mei/interrupt.c
rename to drivers/misc/mei/interrupt.c
diff --git a/drivers/staging/mei/iorw.c b/drivers/misc/mei/iorw.c
similarity index 100%
rename from drivers/staging/mei/iorw.c
rename to drivers/misc/mei/iorw.c
diff --git a/drivers/staging/mei/main.c b/drivers/misc/mei/main.c
similarity index 100%
rename from drivers/staging/mei/main.c
rename to drivers/misc/mei/main.c
diff --git a/drivers/staging/mei/mei-amt-version.c b/drivers/misc/mei/mei-amt-version.c
similarity index 100%
rename from drivers/staging/mei/mei-amt-version.c
rename to drivers/misc/mei/mei-amt-version.c
diff --git a/drivers/staging/mei/mei.h b/drivers/misc/mei/mei.h
similarity index 100%
rename from drivers/staging/mei/mei.h
rename to drivers/misc/mei/mei.h
diff --git a/drivers/staging/mei/mei.txt b/drivers/misc/mei/mei.txt
similarity index 100%
rename from drivers/staging/mei/mei.txt
rename to drivers/misc/mei/mei.txt
diff --git a/drivers/staging/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
similarity index 100%
rename from drivers/staging/mei/mei_dev.h
rename to drivers/misc/mei/mei_dev.h
diff --git a/drivers/staging/mei/wd.c b/drivers/misc/mei/wd.c
similarity index 100%
rename from drivers/staging/mei/wd.c
rename to drivers/misc/mei/wd.c
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 60221ef..32b02e4 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -112,8 +112,6 @@
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 0381958..e603c07 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -50,7 +50,6 @@
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/