commit e2c741ce0fa6e956bf0c70e5b132d4f62fb44738
author Elliott Hughes <enh@google.com> Tue May 17 03:13:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 17 03:13:07 2016 +0000
tree 146be5c8d5dace5ee7bd8445e5f6adeb20fccdef
parent f7d2b8276ad3020c9f5c8accf26ba78e2e1a05c1
parent 9b0eb7cdf4ac4650fc3f476c2f5a91c50a18e524

Merge "Don\'t include <machine/cpu-features.h>."
am: 9b0eb7cdf4

* commit '9b0eb7cdf4ac4650fc3f476c2f5a91c50a18e524':
  Don't include <machine/cpu-features.h>.

Change-Id: Ie2b744b8dc414b7dc8568dae77eeb3babf7df3a8

libpixelflinger/scanline.cpp

diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp
index f48e1d0..aa18360 100644
--- a/libpixelflinger/scanline.cpp
+++ b/libpixelflinger/scanline.cpp
@@ -26,10 +26,6 @@
 #include <cutils/memory.h>
 #include <cutils/log.h>
 
-#ifdef __arm__
-#include <machine/cpu-features.h>
-#endif
-
 #include "buffer.h"
 #include "scanline.h"