aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-rm680.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-17 14:13:42 -0400
committerTony Lindgren <tony@atomide.com>2012-10-17 14:13:42 -0400
commit46cddc01aa6a017193ae7320ef8bfc8242782a66 (patch)
treeda67a2fb45e512689bf909b4f832a8daea57e140 /arch/arm/mach-omap2/board-rm680.c
parent99f0b8d6b09b0db6452d0d6e252bfa28049bbea9 (diff)
parent53db20d123f7a1bf44e46b727775403672655fde (diff)
Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers
Conflicts: arch/arm/mach-omap1/devices.c arch/arm/mach-omap2/omap_hwmod_33xx_data.c arch/arm/mach-omap2/omap_hwmod_3xxx_data.c drivers/mmc/host/omap.c
Diffstat (limited to 'arch/arm/mach-omap2/board-rm680.c')
-rw-r--r--arch/arm/mach-omap2/board-rm680.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index 3c3a47317f8f..208a7a239db5 100644
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -23,13 +23,13 @@
23#include <asm/mach-types.h> 23#include <asm/mach-types.h>
24 24
25#include <plat/i2c.h> 25#include <plat/i2c.h>
26#include <plat/mmc.h>
27#include <plat/usb.h> 26#include <plat/usb.h>
28#include "gpmc.h" 27#include "gpmc.h"
29#include "common.h" 28#include "common.h"
30#include <plat/serial.h> 29#include <plat/serial.h>
31 30
32#include "mux.h" 31#include "mux.h"
32#include "mmc.h"
33#include "hsmmc.h" 33#include "hsmmc.h"
34#include "sdram-nokia.h" 34#include "sdram-nokia.h"
35#include "common-board-devices.h" 35#include "common-board-devices.h"