]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
ARM: OMAP2+: Fix build error after merge
authorTony Lindgren <tony@atomide.com>
Sat, 3 Mar 2012 17:47:45 +0000 (09:47 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 7 Mar 2012 17:03:03 +0000 (09:03 -0800)
commit2b43e4e5863fb41d85c3a6583fdeea2ebf3d2b50
tree1ea02ae04aece3c93af273df00ee6db9a730b92c
parent1b35af54ee9cbbdd13fed53fd4acb0952ba522e1
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>
arch/arm/mach-omap2/cm2xxx_3xxx.c
arch/arm/mach-omap2/common.c
arch/arm/mach-omap2/control.c
arch/arm/mach-omap2/sdrc2xxx.c