diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-03 12:47:45 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-07 12:03:03 -0500 |
| commit | 2b43e4e5863fb41d85c3a6583fdeea2ebf3d2b50 (patch) | |
| tree | 1ea02ae04aece3c93af273df00ee6db9a730b92c /arch/arm/mach-omap2/control.c | |
| parent | 1b35af54ee9cbbdd13fed53fd4acb0952ba522e1 (diff) | |
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>
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
| -rw-r--r-- | arch/arm/mach-omap2/control.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index 2fd5fd1abb4f..08e674bb0417 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | 17 | ||
| 18 | #include <plat/hardware.h> | ||
| 18 | #include <plat/sdrc.h> | 19 | #include <plat/sdrc.h> |
| 19 | 20 | ||
| 20 | #include "iomap.h" | 21 | #include "iomap.h" |