diff options
| author | Oren Weil <oren.jer.weil@intel.com> | 2011-05-15 13:43:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-18 08:30:59 -0700 |
| commit | 6b8aae5aceb689ace3b8997393fe222b83956e53 (patch) | |
| tree | acfd1512a82476f4822db8030e5cde33699705a0 | |
| parent | 3ceb3e66a072b7a41ec065aeb120a38c05bc8b7a (diff) | |
| download | kernel_samsung_smdk4412-6b8aae5aceb689ace3b8997393fe222b83956e53.zip kernel_samsung_smdk4412-6b8aae5aceb689ace3b8997393fe222b83956e53.tar.gz kernel_samsung_smdk4412-6b8aae5aceb689ace3b8997393fe222b83956e53.tar.bz2 | |
staging/mei: add mei to staging Kbuild
Add mei to Kconfig and Makefile in drivers/staging
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Itzhak Tzeel-Krupp <itzhak.tzeel-krupp@intel.com>
Signed-off-by: Oren Weil <oren.jer.weil@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/mei/Kconfig | 28 | ||||
| -rw-r--r-- | drivers/staging/mei/Makefile | 11 |
4 files changed, 42 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index dcd8a76..aac63cb 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -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 diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index e150a45..00bed68 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -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/ diff --git a/drivers/staging/mei/Kconfig b/drivers/staging/mei/Kconfig new file mode 100644 index 0000000..3f3f170 --- /dev/null +++ b/drivers/staging/mei/Kconfig @@ -0,0 +1,28 @@ +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/> diff --git a/drivers/staging/mei/Makefile b/drivers/staging/mei/Makefile new file mode 100644 index 0000000..57168db --- /dev/null +++ b/drivers/staging/mei/Makefile @@ -0,0 +1,11 @@ +# +# 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 |