Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

* 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Fix build error after merge
2012-03-07 14:05:29 -08:00 · 2012-03-07 14:05:29 -08:00 · 4d02be5a65
parent 18bb4fb287 2b43e4e586
commit 4d02be5a65
4 changed files with 5 additions and 0 deletions
--- a/arch/arm/mach-omap2/cm2xxx_3xxx.c
+++ b/arch/arm/mach-omap2/cm2xxx_3xxx.c
@ -18,6 +18,8 @@
 #include <linux/err.h>
 #include <linux/io.h>

+#include <plat/hardware.h>
+
 #include "iomap.h"
 #include "common.h"
 #include "cm.h"
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@ -17,6 +17,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>

+#include <plat/hardware.h>
 #include <plat/board.h>
 #include <plat/mux.h>
 #include <plat/clock.h>
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/io.h>

+#include <plat/hardware.h>
 #include <plat/sdrc.h>

 #include "iomap.h"
--- a/arch/arm/mach-omap2/sdrc2xxx.c
+++ b/arch/arm/mach-omap2/sdrc2xxx.c
@ -24,6 +24,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>

+#include <plat/hardware.h>
 #include <plat/clock.h>
 #include <plat/sram.h>
 #include <plat/sdrc.h>