aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-n8x0.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-n8x0.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-n8x0.c')
-rw-r--r--arch/arm/mach-omap2/board-n8x0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 92b19166aac8..cea433b9b7b9 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -29,7 +29,7 @@
29 29
30#include "common.h" 30#include "common.h"
31#include <plat/menelaus.h> 31#include <plat/menelaus.h>
32#include <plat/mmc.h> 32#include "mmc.h"
33 33
34#include "mux.h" 34#include "mux.h"
35#include "gpmc-onenand.h" 35#include "gpmc-onenand.h"