am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
* commit 'cb71ed3092cef3b1c56d8d873788daea82de7879':
Always include <sys/socket.h> before <linux/netlink.h>.
diff --git a/charger/charger.c b/charger/charger.c
index abf5517..76be076 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -21,19 +21,20 @@
#include <errno.h>
#include <fcntl.h>
#include <linux/input.h>
-#include <linux/netlink.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/poll.h>
-#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/un.h>
#include <time.h>
#include <unistd.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+
#include <cutils/android_reboot.h>
#include <cutils/klog.h>
#include <cutils/list.h>
diff --git a/libnl_2/genl/genl.c b/libnl_2/genl/genl.c
index 2442993..1e127af 100644
--- a/libnl_2/genl/genl.c
+++ b/libnl_2/genl/genl.c
@@ -20,6 +20,7 @@
#include <unistd.h>
#include <stdio.h>
#include <sys/time.h>
+#include <sys/socket.h>
#include <linux/netlink.h>
#include "netlink-types.h"
diff --git a/libnl_2/msg.c b/libnl_2/msg.c
index 283da6e..1303e8a 100644
--- a/libnl_2/msg.c
+++ b/libnl_2/msg.c
@@ -18,6 +18,7 @@
#include <malloc.h>
#include <unistd.h>
+#include <sys/socket.h>
#include <linux/netlink.h>
#include "netlink-types.h"