commit 1cc09402e86b91213e06a9a349c5c510cefcf1d5
author Elliott Hughes <enh@google.com> Tue Jan 29 16:58:45 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 29 16:58:45 2013 -0800
tree 675cd46af616c104530f1237b128899c1bab4b3b
parent be11de2b52ac5f8cbb5a733821cb27002f2ea975
parent f67219783fa7c38c1f4f077364290d10d3aa1db4

am f6721978: Merge "Fix x86 build to use <elf.h>."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f67219783fa7c38c1f4f077364290d10d3aa1db4':
  Fix x86 build to use <elf.h>.

libc/bionic/dl_iterate_phdr_static.c

diff --git a/libc/bionic/dl_iterate_phdr_static.c b/libc/bionic/dl_iterate_phdr_static.c
index b8ef9e9..90ed1b7 100644
--- a/libc/bionic/dl_iterate_phdr_static.c
+++ b/libc/bionic/dl_iterate_phdr_static.c
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
+#include <elf.h>
 #include <sys/types.h>
-#include <linux/elf.h>
 #include <link.h>
 
 /* Dynamic binaries get this from the dynamic linker (system/linker), which