dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2012-03-03 09:47:45 -08:00
parent 1b35af54ee
commit 2b43e4e586
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/cm2xxx_3xxx.c
View File

@ -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"

1
arch/arm/mach-omap2/common.c
View File

@ -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>

1
arch/arm/mach-omap2/control.c
View File

@ -15,6 +15,7 @@
#include <linux/kernel.h>
#include <linux/io.h>
#include <plat/hardware.h>
#include <plat/sdrc.h>
#include "iomap.h"

1
arch/arm/mach-omap2/sdrc2xxx.c
View File

@ -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>