summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-02-12 12:53:25 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-12 12:53:25 -0500
commitfe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8 (patch)
tree53cfdb46981edc2e8364a37aa77c03b84c1ab2c8 /config-generic
parenta281db65717544f11d8b1d8a221a60d522e03628 (diff)
downloadkernel-fe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8.tar.gz
kernel-fe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8.tar.xz
kernel-fe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8.zip
Linux v3.19-4542-g8cc748aa76c9
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic4
1 files changed, 3 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index acd866ec2..fd2ce5021 100644
--- a/config-generic
+++ b/config-generic
@@ -2364,7 +2364,7 @@ CONFIG_TCG_TIS=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
# CONFIG_TCG_INFINEON is not set
-# CONFIG_TCG_ST33_I2C is not set
+# CONFIG_TCG_TIS_I2C_ST33 is not set
# CONFIG_TCG_XEN is not set
CONFIG_TELCLOCK=m
@@ -5352,6 +5352,7 @@ CONFIG_HWSPINLOCK=m
CONFIG_PSTORE=y
CONFIG_PSTORE_RAM=m
# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
# CONFIG_PSTORE_FTRACE is not set
# CONFIG_TEST_LKM is not set
@@ -5380,6 +5381,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
CONFIG_IOMMU_SUPPORT=y
# CONFIG_MAILBOX is not set
+# CONFIG_ALTERA_MBOX is not set
# CONFIG_RESET_CONTROLLER is not set