[kernel] r19561 - in dists/trunk/linux/debian: . config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Fri Nov 30 15:20:31 2012
New Revision: 19561

Log:
x86 enable INTEL_MEI

curious which can of worms this opens.

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Fri Nov 30 15:20:29 2012	(r19560)
+++ dists/trunk/linux/debian/changelog	Fri Nov 30 15:20:31 2012	(r19561)
@@ -1,6 +1,7 @@
 linux (3.6.8-1~experimental.2) UNRELEASED; urgency=low
 
   * Enable NETFILTER_XT_TARGET_HMARK, NET_EMATCH_IPSET.
+  * [x86] Enable INTEL_MEI.
 
  -- maximilian attems <maks at debian.org>  Fri, 30 Nov 2012 15:54:56 +0100
 

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Fri Nov 30 15:20:29 2012	(r19560)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Fri Nov 30 15:20:31 2012	(r19561)
@@ -706,6 +706,11 @@
 CONFIG_PCH_PHUB=m
 
 ##
+## file: drivers/misc/mei/Kconfig
+##
+CONFIG_INTEL_MEI=m
+
+##
 ## file: drivers/mmc/Kconfig
 ##
 CONFIG_MMC=m