Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b43e4e5 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Fix build error after merge 



Commit 9890ce44 (ARM: get rid of asm/irq.h in asm/prom.h)
removed include of asm/irq.h in asm/prom.h. This commit
together with recent omap cleanup to remove io.h causes
build breakage:

arrch/arm/mach-omap2/control.c: In function 'omap3_ctrl_write_boot_mode':
arch/arm/mach-omap2/control.c:238: error:
'OMAP343X_CTRL_BASE' undeclared (first use in this function)
...

Fix this by including hardware.h directly where needed
instead of relying on asm/irq.h in asm/prom.h.

Reported-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1b35af54

arch/arm/mach-omap2/cm2xxx_3xxx.c

+2 −0
Original line number Diff line number Diff line
@@ -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"

arch/arm/mach-omap2/common.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-omap2/control.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/kernel.h>

#include <linux/io.h>



#include <plat/hardware.h>

#include <plat/sdrc.h>



#include "iomap.h"

arch/arm/mach-omap2/sdrc2xxx.c

+1 −0
Original line number Diff line number Diff line
@@ -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>