Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus

[~andy/linux] / arch / arm / mach-omap2 / common.c

diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index cddc89ab7479e96a6ca87151d230e008e1a436fe..778929f7e92d37a1284900f3d9ca2a9e5e56ceb4 100644 (file)
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -19,12 +19,12 @@
 
 #include <plat/common.h>
 #include <plat/board.h>
-#include <plat/control.h>
 #include <plat/mux.h>
 
 #include <plat/clock.h>
 
 #include "sdrc.h"
+#include "control.h"
 
 /* Global address base setup code */