summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-03 11:23:43 -0700
committerTony Lindgren <tony@atomide.com>2012-10-18 16:13:41 -0700
commitdc843280c954877b8a196e59a9f92cd8b94c2d25 (patch)
tree7341354c14364feea450348643c133d1e1d1164a /arch/arm/mach-omap2
parent2a296c8f89bc6aaf91b255c7d631fcbbfaf840ec (diff)
downloadblackbird-obmc-linux-dc843280c954877b8a196e59a9f92cd8b94c2d25.tar.gz
blackbird-obmc-linux-dc843280c954877b8a196e59a9f92cd8b94c2d25.zip
ARM: OMAP: Merge plat/multi.h into plat/cpu.h
This is private to cpu.h and no other places should need to include it and we can drop the include in mach-omap2/io.c. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/io.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 60dede839a35..b373cb59845c 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -27,12 +27,11 @@
#include <plat/serial.h>
#include <plat/omap-pm.h>
-#include "omap_hwmod.h"
-#include <plat/multi.h>
#include <plat-omap/dma-omap.h>
#include "../plat-omap/sram.h"
+#include "omap_hwmod.h"
#include "soc.h"
#include "iomap.h"
#include "voltage.h"
OpenPOWER on IntegriCloud