summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-09-05 08:15:59 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-09-05 08:16:31 -0400
commitf55bd27d50aa3ee15819e85ca0984a3af33d3c30 (patch)
treec2442af31d45db0b9ddd559622a1bc7effbecbb8 /config-generic
parent7f84e82fc97765b1ad39b25406fd5179bd65b130 (diff)
downloadkernel-f55bd27d50aa3ee15819e85ca0984a3af33d3c30.tar.gz
kernel-f55bd27d50aa3ee15819e85ca0984a3af33d3c30.tar.xz
kernel-f55bd27d50aa3ee15819e85ca0984a3af33d3c30.zip
Linux v3.11-3891-gae7a835
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 2d6092e4c..d64d6d3c7 100644
--- a/config-generic
+++ b/config-generic
@@ -200,6 +200,7 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_FW_LOADER_USER_HELPER is not set
# CONFIG_CMA is not set
+# CONFIG_DMA_CMA is not set
# CONFIG_SPI is not set
@@ -2195,6 +2196,7 @@ CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
# CONFIG_TCG_INFINEON is not set
# CONFIG_TCG_ST33_I2C is not set
+# CONFIG_TCG_XEN is not set
CONFIG_TELCLOCK=m
#