From 01a67dbfc491832def1ba8a2c3e7cda228e6f7c2 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Tue, 2 Aug 2016 17:54:39 -0400
Subject: ./fixup.sh

---
 src/grp-udev/ata_id/ata_id.c                      | 5 +++--
 src/grp-udev/cdrom_id/cdrom_id.c                  | 3 ++-
 src/grp-udev/libudev-core/net/ethtool-util.c      | 5 +++--
 src/grp-udev/libudev-core/udev-builtin-input_id.c | 5 +++--
 src/grp-udev/libudev-core/udev-builtin-keyboard.c | 3 ++-
 src/grp-udev/libudev-core/udev-builtin-net_id.c   | 3 ++-
 src/grp-udev/scsi_id/scsi_serial.c                | 5 +++--
 src/grp-udev/v4l_id/v4l_id.c                      | 3 ++-
 8 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'src/grp-udev')

diff --git a/src/grp-udev/ata_id/ata_id.c b/src/grp-udev/ata_id/ata_id.c
index 22231225b6..4728d72a57 100644
--- a/src/grp-udev/ata_id/ata_id.c
+++ b/src/grp-udev/ata_id/ata_id.c
@@ -23,8 +23,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <linux/bsg.h>
-#include <linux/hdreg.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/sg.h>
@@ -37,6 +35,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <linux/bsg.h>
+#include <linux/hdreg.h>
+
 #include <libudev.h>
 
 #include "basic/fd-util.h"
diff --git a/src/grp-udev/cdrom_id/cdrom_id.c b/src/grp-udev/cdrom_id/cdrom_id.c
index 90df241b45..9a5af6d614 100644
--- a/src/grp-udev/cdrom_id/cdrom_id.c
+++ b/src/grp-udev/cdrom_id/cdrom_id.c
@@ -21,7 +21,6 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <limits.h>
-#include <linux/cdrom.h>
 #include <scsi/sg.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -34,6 +33,8 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <linux/cdrom.h>
+
 #include <libudev.h>
 
 #include "basic/random-util.h"
diff --git a/src/grp-udev/libudev-core/net/ethtool-util.c b/src/grp-udev/libudev-core/net/ethtool-util.c
index 759ecde5e4..b381284a6b 100644
--- a/src/grp-udev/libudev-core/net/ethtool-util.c
+++ b/src/grp-udev/libudev-core/net/ethtool-util.c
@@ -17,11 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/ethtool.h>
-#include <linux/sockios.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
 
+#include <linux/ethtool.h>
+#include <linux/sockios.h>
+
 #include "basic/log.h"
 #include "basic/string-table.h"
 #include "basic/strxcpyx.h"
diff --git a/src/grp-udev/libudev-core/udev-builtin-input_id.c b/src/grp-udev/libudev-core/udev-builtin-input_id.c
index f5d700e299..386ef5b5dc 100644
--- a/src/grp-udev/libudev-core/udev-builtin-input_id.c
+++ b/src/grp-udev/libudev-core/udev-builtin-input_id.c
@@ -22,14 +22,15 @@
  */
 
 #include <errno.h>
-#include <linux/input.h>
-#include <linux/limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <linux/input.h>
+#include <linux/limits.h>
+
 #include "basic/fd-util.h"
 #include "basic/stdio-util.h"
 #include "basic/string-util.h"
diff --git a/src/grp-udev/libudev-core/udev-builtin-keyboard.c b/src/grp-udev/libudev-core/udev-builtin-keyboard.c
index 5067e2247a..d07eff08d6 100644
--- a/src/grp-udev/libudev-core/udev-builtin-keyboard.c
+++ b/src/grp-udev/libudev-core/udev-builtin-keyboard.c
@@ -17,12 +17,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/input.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
 
+#include <linux/input.h>
+
 #include "basic/fd-util.h"
 #include "basic/parse-util.h"
 #include "basic/stdio-util.h"
diff --git a/src/grp-udev/libudev-core/udev-builtin-net_id.c b/src/grp-udev/libudev-core/udev-builtin-net_id.c
index f120f816e8..51f734d2c1 100644
--- a/src/grp-udev/libudev-core/udev-builtin-net_id.c
+++ b/src/grp-udev/libudev-core/udev-builtin-net_id.c
@@ -89,7 +89,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/pci_regs.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <stdarg.h>
@@ -98,6 +97,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <linux/pci_regs.h>
+
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/stdio-util.h"
diff --git a/src/grp-udev/scsi_id/scsi_serial.c b/src/grp-udev/scsi_id/scsi_serial.c
index f926e17dad..544fcde108 100644
--- a/src/grp-udev/scsi_id/scsi_serial.c
+++ b/src/grp-udev/scsi_id/scsi_serial.c
@@ -20,8 +20,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <linux/bsg.h>
-#include <linux/types.h>
 #include <scsi/scsi.h>
 #include <scsi/sg.h>
 #include <stdio.h>
@@ -33,6 +31,9 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <linux/bsg.h>
+#include <linux/types.h>
+
 #include <libudev.h>
 
 #include "basic/random-util.h"
diff --git a/src/grp-udev/v4l_id/v4l_id.c b/src/grp-udev/v4l_id/v4l_id.c
index 3271121a3b..d1aad403b9 100644
--- a/src/grp-udev/v4l_id/v4l_id.c
+++ b/src/grp-udev/v4l_id/v4l_id.c
@@ -17,7 +17,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <linux/videodev2.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,6 +25,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <linux/videodev2.h>
+
 #include "basic/fd-util.h"
 #include "basic/util.h"
 
-- 
cgit v1.2.3-54-g00ecf