Browse Source

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>
Greg Kroah-Hartman 13 years ago
parent
commit
ffc2825c29

+ 1 - 0
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

+ 1 - 0
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/

+ 0 - 0
drivers/staging/mei/Kconfig → drivers/misc/mei/Kconfig


+ 0 - 0
drivers/staging/mei/Makefile → drivers/misc/mei/Makefile


+ 0 - 0
drivers/staging/mei/TODO → drivers/misc/mei/TODO


+ 0 - 0
drivers/staging/mei/hw.h → drivers/misc/mei/hw.h


+ 0 - 0
drivers/staging/mei/init.c → drivers/misc/mei/init.c


+ 0 - 0
drivers/staging/mei/interface.c → drivers/misc/mei/interface.c


+ 0 - 0
drivers/staging/mei/interface.h → drivers/misc/mei/interface.h


+ 0 - 0
drivers/staging/mei/interrupt.c → drivers/misc/mei/interrupt.c


+ 0 - 0
drivers/staging/mei/iorw.c → drivers/misc/mei/iorw.c


+ 0 - 0
drivers/staging/mei/main.c → drivers/misc/mei/main.c


+ 0 - 0
drivers/staging/mei/mei-amt-version.c → drivers/misc/mei/mei-amt-version.c


+ 0 - 0
drivers/staging/mei/mei.h → drivers/misc/mei/mei.h


+ 0 - 0
drivers/staging/mei/mei.txt → drivers/misc/mei/mei.txt


+ 0 - 0
drivers/staging/mei/mei_dev.h → drivers/misc/mei/mei_dev.h


+ 0 - 0
drivers/staging/mei/wd.c → drivers/misc/mei/wd.c


+ 0 - 2
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"

+ 0 - 1
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/