commit 540c0274bedb28050223c305f9a5499b06df328e
author Elliott Hughes <enh@google.com> Tue May 17 23:05:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 17 23:05:56 2016 +0000
tree d60300a99b2a299c6a078c815ccbba8d9c35b389
parent 820e63e1e69b493368ccb083af7362f372c49ee4
parent 36085979592293853cb18fadb61358f5b7f4f717

Merge "scrypt doesn\'t need <machine/cpu-features.h>." am: e6e09c358c
am: 3608597959

* commit '36085979592293853cb18fadb61358f5b7f4f717':
  scrypt doesn't need <machine/cpu-features.h>.

Change-Id: I724c161acbb6b2caa6ba9d438c1325e95ad4b830

lib/crypto/crypto_scrypt-neon.c

diff --git a/lib/crypto/crypto_scrypt-neon.c b/lib/crypto/crypto_scrypt-neon.c
index a3bf052..d05ee1b 100644
--- a/lib/crypto/crypto_scrypt-neon.c
+++ b/lib/crypto/crypto_scrypt-neon.c
@@ -28,7 +28,6 @@
  */
 #include "scrypt_platform.h"
 
-#include <machine/cpu-features.h>
 #include <arm_neon.h>
 
 #include <errno.h>

patches/arm-neon.patch

diff --git a/patches/arm-neon.patch b/patches/arm-neon.patch
index 7197f99..02ff357 100644
--- a/patches/arm-neon.patch
+++ b/patches/arm-neon.patch
@@ -129,7 +129,7 @@
 index 0000000..a3bf052
 --- /dev/null
 +++ b/lib/crypto/crypto_scrypt-neon.c
-@@ -0,0 +1,305 @@
+@@ -0,0 +1,304 @@
 +/*-
 + * Copyright 2009 Colin Percival
 + * All rights reserved.
@@ -160,7 +160,6 @@
 + */
 +#include "scrypt_platform.h"
 +
-+#include <machine/cpu-features.h>
 +#include <arm_neon.h>
 +
 +#include <errno.h>