summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-10-15 13:06:54 +0100
committerPeter Robinson <pbrobinson@gmail.com>2016-10-15 13:06:54 +0100
commit585f95eb353631f70488552816d2b8d3b4f85096 (patch)
tree7ca7f8cf05d8be31bb1ca182c3f97f2fee229f70
parent14a79ed544a368ea8ad9d0e5eff225f8991553c2 (diff)
downloadkernel-585f95eb353631f70488552816d2b8d3b4f85096.tar.gz
kernel-585f95eb353631f70488552816d2b8d3b4f85096.tar.xz
kernel-585f95eb353631f70488552816d2b8d3b4f85096.zip
Re-enable omap-aes as should now be fixed
-rw-r--r--config-armv73
-rw-r--r--kernel.spec1
2 files changed, 2 insertions, 2 deletions
diff --git a/config-armv7 b/config-armv7
index 31439c029..07b8f7acf 100644
--- a/config-armv7
+++ b/config-armv7
@@ -146,8 +146,7 @@ CONFIG_PWM_OMAP_DMTIMER=m
# CONFIG_PWM_STMPE is not set
CONFIG_CRYPTO_DEV_OMAP_SHAM=m
-# Disable for the moment, terribly broken upstream
-# CONFIG_CRYPTO_DEV_OMAP_AES is not set
+CONFIG_CRYPTO_DEV_OMAP_AES=m
CONFIG_CRYPTO_DEV_OMAP_DES=m
CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_OMAP3_ROM=m
diff --git a/kernel.spec b/kernel.spec
index 9de281337..b54e34f7d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2144,6 +2144,7 @@ fi
%changelog
* Sat Oct 15 2016 Peter Robinson <pbrobinson@fedoraproject.org>
- Minor ARM config cleanups
+- Re-enable omap-aes as should now be fixed
* Fri Oct 14 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git9.1
- Linux v4.8-14604-g29fbff8