--- /dev/null
+From 8736f8022e532a3c1d8873aac78e1113c6ffc3b9 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 12 Aug 2016 16:04:33 +0300
+Subject: spi: spidev_test: fix build with musl libc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Baruch Siach <baruch@tkos.co.il>
+
+commit 8736f8022e532a3c1d8873aac78e1113c6ffc3b9 upstream.
+
+spidev.h uses _IOC_SIZEBITS directly. musl libc does not provide this macro
+unless linux/ioctl.h is included explicitly. Fixes build failures like:
+
+In file included from .../host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/sys/ioctl.h:7:0,
+ from .../build/spidev_test-v3.15/spidev_test.c:20:
+.../build/spidev_test-v3.15/spidev_test.c: In function ‘transfer’:
+.../build/spidev_test-v3.15/spidev_test.c:75:18: error: ‘_IOC_SIZEBITS’ undeclared (first use in this function)
+ ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr);
+ ^
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Cc: Ralph Sennhauser <ralph.sennhauser@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/spi/spidev_test.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/tools/spi/spidev_test.c
++++ b/tools/spi/spidev_test.c
+@@ -19,6 +19,7 @@
+ #include <getopt.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
++#include <linux/ioctl.h>
+ #include <sys/stat.h>
+ #include <linux/types.h>
+ #include <linux/spi/spidev.h>