commit 9d995d67217e44e022c9e5d0767634fa81f87b78
author Elliott Hughes <enh@google.com> Tue Jan 29 17:04:14 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 29 17:04:14 2013 -0800
tree e590a8a5c44ccd32a9a35e6fd046d311d0cd3b14
parent 0a383883fa3d358ff4af6b653a0918f4cd01ef7e
parent 1cc09402e86b91213e06a9a349c5c510cefcf1d5

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

# Via Android Git Automerger (1) and others
* commit '1cc09402e86b91213e06a9a349c5c510cefcf1d5':
  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