Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-headers

[karo-tx-linux.git] / arch / arm / mach-omap2 / board-rx51-peripherals.c

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 42b6056decaead849efc89d93802ad4a99016ace..c2eed847c05b7d11484a2fab4f5a092b8831ebef 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -31,8 +31,7 @@
 #include <asm/system_info.h>
 
 #include "common.h"
-#include <plat/dma.h>
-#include "gpmc.h"
+#include <plat-omap/dma-omap.h>
 #include <plat/omap-pm.h>
 #include "gpmc-smc91x.h"
 
@@ -54,6 +53,7 @@
 #include "mux.h"
 #include "hsmmc.h"
 #include "common-board-devices.h"
+#include "gpmc.h"
 #include "gpmc-onenand.h"
 
 #define SYSTEM_REV_B_USES_VAUX3        0x1699