Commit 6b8aae5a authored by Oren Weil's avatar Oren Weil Committed by Greg Kroah-Hartman
Browse files

staging/mei: add mei to staging Kbuild 



Add mei to Kconfig and Makefile in drivers/staging

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarItzhak Tzeel-Krupp <itzhak.tzeel-krupp@intel.com>
Signed-off-by: default avatarOren Weil <oren.jer.weil@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3ceb3e66

drivers/staging/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -173,5 +173,7 @@ source "drivers/staging/gma500/Kconfig" 


source "drivers/staging/altera-stapl/Kconfig"



source "drivers/staging/mei/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -69,3 +69,4 @@ obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ 
obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)	+= cptm1217/

obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)	+= ste_rmi4/

obj-$(CONFIG_DRM_PSB)		+= gma500/

obj-$(CONFIG_INTEL_MEI)		+= mei/

drivers/staging/mei/Kconfig

0 → 100644
+28 −0
Original line number Diff line number Diff line 
config INTEL_MEI

	tristate "Intel Management Engine Interface (Intel MEI)"

	depends on X86 && PCI && EXPERIMENTAL

	help

	  The Intel Management Engine (Intel ME) provides Manageability,

	  Security and Media services for system containing Intel chipsets.

	  if selected /dev/mei misc device will be created.



	  Supported Chipsets are:

	  7 Series Chipset Family

	  6 Series Chipset Family

	  5 Series Chipset Family

	  4 Series Chipset Family

	  Mobile 4 Series Chipset Family

	  ICH9

	  82946GZ/GL

	  82G35 Express

	  82Q963/Q965

	  82P965/G965

	  Mobile PM965/GM965

	  Mobile GME965/GLE960

	  82Q35 Express

	  82G33/G31/P35/P31 Express

	  82Q33 Express

	  82X38/X48 Express



	  For more information see

	  <http://software.intel.com/en-us/manageability/>

drivers/staging/mei/Makefile

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#

# Makefile - Intel Management Engine Interface (Intel MEI) Linux driver

# Copyright (c) 2010-2011, Intel Corporation.

#

obj-$(CONFIG_INTEL_MEI) += mei.o

mei-objs := init.o

mei-objs += interrupt.o

mei-objs += interface.o

mei-objs += iorw.o

mei-objs += main.o

mei-objs += wd.o