summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-17 11:13:42 -0700
committerTony Lindgren <tony@atomide.com>2012-10-17 11:13:42 -0700
commit46cddc01aa6a017193ae7320ef8bfc8242782a66 (patch)
treeda67a2fb45e512689bf909b4f832a8daea57e140 /arch/arm/mach-omap2/omap_hwmod_33xx_data.c
parent99f0b8d6b09b0db6452d0d6e252bfa28049bbea9 (diff)
parent53db20d123f7a1bf44e46b727775403672655fde (diff)
downloadblackbird-op-linux-46cddc01aa6a017193ae7320ef8bfc8242782a66.tar.gz
blackbird-op-linux-46cddc01aa6a017193ae7320ef8bfc8242782a66.zip
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/omap_hwmod_33xx_data.c')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_33xx_data.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index f7f3c2dfa0af..44a661882a7e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -18,8 +18,6 @@
#include <plat/cpu.h>
#include <linux/platform_data/gpio-omap.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
-#include <plat-omap/dma-omap.h>
-#include <plat/mmc.h>
#include <plat/i2c.h>
#include "omap_hwmod_common_data.h"
@@ -28,6 +26,7 @@
#include "cm33xx.h"
#include "prm33xx.h"
#include "prm-regbits-33xx.h"
+#include "mmc.h"
/*
* IP blocks
OpenPOWER on IntegriCloud