commit c67a6425854560f7fd0bfac9d51263bd09a22552
author Elliott Hughes <enh@google.com> Fri Jul 18 23:48:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 18 23:48:27 2014 +0000
tree 3c9b1cdc355b2cc80e3af8f87462ba5f2af15701
parent 4a95a209e8fc472461aa75282b486e1860edde19
parent fd62d07db04277bd54485a969b0870221de5c18e

am fd62d07d: Merge "Fix implicit declaration of function \'prctl\' in adb."

* commit 'fd62d07db04277bd54485a969b0870221de5c18e':
  Fix implicit declaration of function 'prctl' in adb.

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index 90bdbaa..2c7793d 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -37,8 +37,8 @@
 #include <cutils/properties.h>
 #include <private/android_filesystem_config.h>
 #include <sys/capability.h>
-#include <linux/prctl.h>
 #include <sys/mount.h>
+#include <sys/prctl.h>
 #include <getopt.h>
 #include <selinux/selinux.h>
 #else