From: Tony Lindgren Date: Sat, 3 Mar 2012 17:47:45 +0000 (-0800) Subject: ARM: OMAP2+: Fix build error after merge X-Git-Tag: v3.4-rc1~91^2~6^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b43e4e5863fb41d85c3a6583fdeea2ebf3d2b50;p=pandora-kernel.git 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 Signed-off-by: Tony Lindgren --- Reading git-diff-tree failed