diff --git a/[refs] b/[refs]
index 7343660201ec..d7e0028aebb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daec90e7382cbd0e73eb6861109b3da91e5ab1f3
+refs/heads/master: a0f11aceee531d444f58b939e6a537ee5e2b9cc5
diff --git a/trunk/tools/usb/ffs-test.c b/trunk/tools/usb/ffs-test.c
index 8674b9ec14f6..fe1e66b6ef40 100644
--- a/trunk/tools/usb/ffs-test.c
+++ b/trunk/tools/usb/ffs-test.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <tools/le_byteshift.h>
 
-#include "../../include/linux/usb/functionfs.h"
+#include "../../include/uapi/linux/usb/functionfs.h"
 
 
 /******************** Little Endian Handling ********************************/