BACKPORT: linux_spi: reorder includes for linux <4.14
This works around a missing header in spidev.h present in older
versions of Linux. Patch is ported from:
https://git.buildroot.net/buildroot/tree/package/flashrom/0001-spi.patch
Original-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Original-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Original-Signed-off-by: David Hendricks <david.hendricks@gmail.com>
Original-Change-Id: Ieab60f59bc63aca0dc4867f31699dab4167da05b
Original-Reviewed-on: https://review.coreboot.org/c/flashrom/+/35830
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Nico Huber <nico.h@gmx.de>
(cherry picked from commit e0ceedf76d48757a05f22860e7ddd03e430c2252)
BUG=b:153598437
BRANCH=none
TEST=builds
Signed-off-by: Nikolai Artemiev <nartemiev@chromium.org>
Change-Id: If5a9c804a4aa879893387fc6103cf4471741cdb7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/2246078
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Commit-Queue: Nikolai Artemiev <nartemiev@google.com>
diff --git a/linux_spi.c b/linux_spi.c
index d807510..81d29d6 100644
--- a/linux_spi.c
+++ b/linux_spi.c
@@ -27,8 +27,6 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include <linux/types.h>
-#include <linux/spi/spidev.h>
-#include <linux/ioctl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "file.h"
@@ -36,6 +34,13 @@
#include "chipdrivers.h"
#include "programmer.h"
#include "spi.h"
+/*
+ * Linux versions prior to v4.14-rc7 may need linux/ioctl.h included here due
+ * to missing from linux/spi/spidev.h. This was fixed in the following commit:
+ * a2b4a79b88b2 spi: uapi: spidev: add missing ioctl header
+ */
+#include <linux/ioctl.h>
+#include <linux/spi/spidev.h>