summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2019-07-17 19:04:12 +0200
committerNico Huber <nico.h@gmx.de>2019-10-16 19:30:57 +0000
commite0ceedf76d48757a05f22860e7ddd03e430c2252 (patch)
treee74511724d0f856e267825b1bafabe143260164c
parent28d081924ea6fca7a643ae273cb56cd11788adc5 (diff)
downloadflashrom-e0ceedf76d48757a05f22860e7ddd03e430c2252.tar.gz
flashrom-e0ceedf76d48757a05f22860e7ddd03e430c2252.tar.bz2
flashrom-e0ceedf76d48757a05f22860e7ddd03e430c2252.zip
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 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: David Hendricks <david.hendricks@gmail.com> Change-Id: Ieab60f59bc63aca0dc4867f31699dab4167da05b Reviewed-on: https://review.coreboot.org/c/flashrom/+/35830 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--linux_spi.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/linux_spi.c b/linux_spi.c
index e3d7486ee..aa73c1815 100644
--- a/linux_spi.c
+++ b/linux_spi.c
@@ -26,12 +26,17 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include <linux/types.h>
-#include <linux/spi/spidev.h>
-#include <linux/ioctl.h>
#include "flash.h"
#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>
/* Devices known to work with this module (FIXME: export as struct dev_entry):
* Beagle Bone Black