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>
git-mirror · May 1, 2012 · ffc2825 · ffc2825
1 parent 589b3d0
commit ffc2825
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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 → drivers/misc/mei/Kconfig b/drivers/staging/mei/Kconfig → drivers/misc/mei/Kconfig
diff --git a/drivers/staging/mei/Makefile → drivers/misc/mei/Makefile b/drivers/staging/mei/Makefile → drivers/misc/mei/Makefile
diff --git a/drivers/staging/mei/TODO → drivers/misc/mei/TODO b/drivers/staging/mei/TODO → drivers/misc/mei/TODO
diff --git a/drivers/staging/mei/hw.h → drivers/misc/mei/hw.h b/drivers/staging/mei/hw.h → drivers/misc/mei/hw.h
diff --git a/drivers/staging/mei/init.c → drivers/misc/mei/init.c b/drivers/staging/mei/init.c → drivers/misc/mei/init.c
diff --git a/drivers/staging/mei/interface.c → drivers/misc/mei/interface.c b/drivers/staging/mei/interface.c → drivers/misc/mei/interface.c
diff --git a/drivers/staging/mei/interface.h → drivers/misc/mei/interface.h b/drivers/staging/mei/interface.h → drivers/misc/mei/interface.h
diff --git a/drivers/staging/mei/interrupt.c → drivers/misc/mei/interrupt.c b/drivers/staging/mei/interrupt.c → drivers/misc/mei/interrupt.c
diff --git a/drivers/staging/mei/iorw.c → drivers/misc/mei/iorw.c b/drivers/staging/mei/iorw.c → drivers/misc/mei/iorw.c
diff --git a/drivers/staging/mei/main.c → drivers/misc/mei/main.c b/drivers/staging/mei/main.c → drivers/misc/mei/main.c
diff --git a/drivers/staging/mei/mei-amt-version.c → drivers/misc/mei/mei-amt-version.c b/drivers/staging/mei/mei-amt-version.c → drivers/misc/mei/mei-amt-version.c
diff --git a/drivers/staging/mei/mei.h → drivers/misc/mei/mei.h b/drivers/staging/mei/mei.h → drivers/misc/mei/mei.h
diff --git a/drivers/staging/mei/mei.txt → drivers/misc/mei/mei.txt b/drivers/staging/mei/mei.txt → drivers/misc/mei/mei.txt
diff --git a/drivers/staging/mei/mei_dev.h → drivers/misc/mei/mei_dev.h b/drivers/staging/mei/mei_dev.h → drivers/misc/mei/mei_dev.h
diff --git a/drivers/staging/mei/wd.c → drivers/misc/mei/wd.c b/drivers/staging/mei/wd.c → drivers/misc/mei/wd.c
diff --git 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
@@ -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/