Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[firefly-linux-kernel-4.4.55.git] / tools / usb / ffs-test.c

diff --git a/tools/usb/ffs-test.c b/tools/usb/ffs-test.c
index bbe2e3a2ea62adabe32a0ed363b20dfac794d7e9..b9c7986316997b4f820ed1567a71ff911ae3d107 100644 (file)
--- a/tools/usb/ffs-test.c
+++ b/tools/usb/ffs-test.c
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <linux/usb/functionfs.h>
+#include "../../include/linux/usb/functionfs.h"
 
 
 /******************** Little Endian Handling ********************************/
@@ -450,7 +450,7 @@ invalid:
                    len, expected, *p);
                for (p = buf, len = 0; len < nbytes; ++p, ++len) {
                        if (0 == (len % 32))
-                               fprintf(stderr, "%4d:", len);
+                               fprintf(stderr, "%4zd:", len);
                        fprintf(stderr, " %02x", *p);
                        if (31 == (len % 32))
                                fprintf(stderr, "\n");