commit ef3d92f8d668f0a75557201d1d7cd56a4b328ab0
author Matthias Kaehlcke <mka@google.com> Wed May 13 23:25:21 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 13 23:25:21 2015 +0000
tree 4de34768ce0e92dc40285e032e1041648ab821ba
parent 314f82f9cefe819fa4739a55d16bc832b5a74e32
parent ee6596e92e57dd262cd056de101c799d3268e908

Merge "dvbsky_m88rs6000: Make i2c transactions in tuner_read/writereg() atomic"

arch/arm/configs/gfrg200_defconfig

diff --git a/arch/arm/configs/gfrg200_defconfig b/arch/arm/configs/gfrg200_defconfig
index 983573c..035ce4f 100644
--- a/arch/arm/configs/gfrg200_defconfig
+++ b/arch/arm/configs/gfrg200_defconfig
@@ -281,6 +281,7 @@
 CONFIG_UBIFS_FS=y
 CONFIG_UBIFS_FS_DEBUG=y
 CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_XZ=y
 CONFIG_SQUASHFS_EMBEDDED=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@@ -304,6 +305,7 @@
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_MD5=y