Skip to content

Commit

Permalink
ARM: OMAP2+: Fix build error after merge
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tony Lindgren committed Mar 7, 2012
1 parent 1b35af5 commit 2b43e4e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm/mach-omap2/cm2xxx_3xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/control.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <linux/kernel.h>
#include <linux/io.h>

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

#include "iomap.h"
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/sdrc2xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 2b43e4e

Please sign in to comment.