summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-03-01 08:53:59 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-03-01 08:53:59 -0500
commitf5e36b421c636b05a9ef63763b1eff7f02587c7e (patch)
tree18c4080c4c239aadb0d6d66b071ead22aff6a6ee /config-x86-generic
parentd0bae3101fb1b763c754bdacaf523f8bb4d86b6e (diff)
downloadkernel-f5e36b421c636b05a9ef63763b1eff7f02587c7e.tar.gz
kernel-f5e36b421c636b05a9ef63763b1eff7f02587c7e.tar.xz
kernel-f5e36b421c636b05a9ef63763b1eff7f02587c7e.zip
Linux v3.8-10206-gb0af9cd
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 75e604d9b..5bb9d7268 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -435,6 +435,8 @@ CONFIG_INTEL_MEI_ME=y
# CONFIG_X86_INTEL_LPSS is not set
+# CONFIG_INTEL_POWERCLAMP is not set
+
CONFIG_VMWARE_VMCI=m
CONFIG_VMWARE_VMCI_VSOCKETS=m