summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-05-18 08:28:46 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-05-18 08:32:30 -0700
commitaf495309bb553b4659f08470ac94fedf74b3845a (patch)
treef540f17c8dea7042a98db7f6b1d6729817829d27 /config-armv7
parent3856ef7eb1db56671e00a069af6c0614c6b21c7f (diff)
downloadkernel-af495309bb553b4659f08470ac94fedf74b3845a.tar.gz
kernel-af495309bb553b4659f08470ac94fedf74b3845a.tar.xz
kernel-af495309bb553b4659f08470ac94fedf74b3845a.zip
Linux v4.6-3623-g0b7962a
ata, regulator, gpio, HID, livepatching, networking, dm, block, vfs, fs, timers, crypto merges
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv71
1 files changed, 1 insertions, 0 deletions
diff --git a/config-armv7 b/config-armv7
index bcf054c3e..755cefa99 100644
--- a/config-armv7
+++ b/config-armv7
@@ -415,6 +415,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
# CONFIG_CRYPTO_DEV_MXS_DCP is not set
+# CONFIG_CRYPTO_DEV_MXC_SCC is not set
CONFIG_RTC_DRV_SNVS=m
CONFIG_FB_MXS=m
# CONFIG_FB_MX3 is not set