---

yaml --- r: 304532 b: refs/heads/master c: ffc2825 h: refs/heads/master v: v3
git-mirror · May 1, 2012 · 8631482 · 8631482
1 parent 791758c
commit 8631482
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 589b3d06fd159774f9f5c3639d8d5d938670c019
+refs/heads/master: ffc2825c2942b57c5dbfbcb3ad798696438aed62
diff --git a/trunk/drivers/misc/Kconfig b/trunk/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/trunk/drivers/misc/Makefile b/trunk/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/trunk/drivers/staging/mei/Kconfig → trunk/drivers/misc/mei/Kconfig b/trunk/drivers/staging/mei/Kconfig → trunk/drivers/misc/mei/Kconfig
diff --git a/trunk/drivers/staging/mei/Makefile → trunk/drivers/misc/mei/Makefile b/trunk/drivers/staging/mei/Makefile → trunk/drivers/misc/mei/Makefile
diff --git a/trunk/drivers/staging/mei/TODO → trunk/drivers/misc/mei/TODO b/trunk/drivers/staging/mei/TODO → trunk/drivers/misc/mei/TODO
diff --git a/trunk/drivers/staging/mei/hw.h → trunk/drivers/misc/mei/hw.h b/trunk/drivers/staging/mei/hw.h → trunk/drivers/misc/mei/hw.h
diff --git a/trunk/drivers/staging/mei/init.c → trunk/drivers/misc/mei/init.c b/trunk/drivers/staging/mei/init.c → trunk/drivers/misc/mei/init.c
diff --git a/trunk/drivers/staging/mei/interface.c → trunk/drivers/misc/mei/interface.c b/trunk/drivers/staging/mei/interface.c → trunk/drivers/misc/mei/interface.c
diff --git a/trunk/drivers/staging/mei/interface.h → trunk/drivers/misc/mei/interface.h b/trunk/drivers/staging/mei/interface.h → trunk/drivers/misc/mei/interface.h
diff --git a/trunk/drivers/staging/mei/interrupt.c → trunk/drivers/misc/mei/interrupt.c b/trunk/drivers/staging/mei/interrupt.c → trunk/drivers/misc/mei/interrupt.c
diff --git a/trunk/drivers/staging/mei/iorw.c → trunk/drivers/misc/mei/iorw.c b/trunk/drivers/staging/mei/iorw.c → trunk/drivers/misc/mei/iorw.c
diff --git a/trunk/drivers/staging/mei/main.c → trunk/drivers/misc/mei/main.c b/trunk/drivers/staging/mei/main.c → trunk/drivers/misc/mei/main.c
diff --git a/trunk/drivers/staging/mei/mei-amt-version.c → trunk/drivers/misc/mei/mei-amt-version.c b/trunk/drivers/staging/mei/mei-amt-version.c → trunk/drivers/misc/mei/mei-amt-version.c
diff --git a/trunk/drivers/staging/mei/mei.h → trunk/drivers/misc/mei/mei.h b/trunk/drivers/staging/mei/mei.h → trunk/drivers/misc/mei/mei.h
diff --git a/trunk/drivers/staging/mei/mei.txt → trunk/drivers/misc/mei/mei.txt b/trunk/drivers/staging/mei/mei.txt → trunk/drivers/misc/mei/mei.txt
diff --git a/trunk/drivers/staging/mei/mei_dev.h → trunk/drivers/misc/mei/mei_dev.h b/trunk/drivers/staging/mei/mei_dev.h → trunk/drivers/misc/mei/mei_dev.h
diff --git a/trunk/drivers/staging/mei/wd.c → trunk/drivers/misc/mei/wd.c b/trunk/drivers/staging/mei/wd.c → trunk/drivers/misc/mei/wd.c
diff --git a/trunk/drivers/staging/Kconfig b/trunk/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/trunk/drivers/staging/Makefile b/trunk/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/