summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-06-11 08:48:11 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-06-11 08:48:43 -0400
commitfff0cd2bfdd1a2c7288e5bcfe96e1f2a5a3c750e (patch)
treeb3417644bd23ef7ed7654f0bdb22bff122187ae4 /config-x86-generic
parentb9ce3498af1d48bc579902f117c6b03432b111cb (diff)
downloadkernel-fff0cd2bfdd1a2c7288e5bcfe96e1f2a5a3c750e.tar.gz
kernel-fff0cd2bfdd1a2c7288e5bcfe96e1f2a5a3c750e.tar.xz
kernel-fff0cd2bfdd1a2c7288e5bcfe96e1f2a5a3c750e.zip
Linux v3.10-rc5
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic4
1 files changed, 4 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic
index d7b10995..a270b440 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -437,6 +437,10 @@ CONFIG_RCU_FANOUT_LEAF=16
CONFIG_INTEL_MEI=m
CONFIG_INTEL_MEI_ME=y
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD_MEI=m
+
# Maybe enable in debug kernels?
# CONFIG_DEBUG_NMI_SELFTEST is not set