Merge branch 'linus' into perf/urgent, to synchronize UAPI headers

[sfrench/cifs-2.6.git] / arch / arm / mach-imx / mx31moboard-marxbot.c

diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c
index 922d49175cb45fd611af7e7096be795d0624626a..9a5a869be1aecf1889f4e56e26d9833a398e9d4c 100644 (file)
--- a/arch/arm/mach-imx/mx31moboard-marxbot.c
+++ b/arch/arm/mach-imx/mx31moboard-marxbot.c
@@ -24,6 +24,7 @@
 
 #include <linux/usb/otg.h>
 
+#include "board-mx31moboard.h"
 #include "common.h"
 #include "devices-imx31.h"
 #include "ehci.h"