diff options
| author | Tony Lindgren | 2012-03-03 18:47:45 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2012-03-07 18:03:03 +0100 |
| commit | 2b43e4e5863fb41d85c3a6583fdeea2ebf3d2b50 (patch) | |
| tree | 1ea02ae04aece3c93af273df00ee6db9a730b92c /arch/arm/mach-omap2 | |
| parent | ARM: OMAP2+: Fix L4_EMU_34XX_BASE error after iomap changes (diff) | |
| download | kernel-qcow2-linux-2b43e4e5863fb41d85c3a6583fdeea2ebf3d2b50.tar.gz kernel-qcow2-linux-2b43e4e5863fb41d85c3a6583fdeea2ebf3d2b50.tar.xz kernel-qcow2-linux-2b43e4e5863fb41d85c3a6583fdeea2ebf3d2b50.zip | |
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')
| -rw-r--r-- | arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/common.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/control.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/sdrc2xxx.c | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/cm2xxx_3xxx.c b/arch/arm/mach-omap2/cm2xxx_3xxx.c index c79ed63601ca..389f9f8b570c 100644 --- a/arch/arm/mach-omap2/cm2xxx_3xxx.c +++ b/arch/arm/mach-omap2/cm2xxx_3xxx.c @@ -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" diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 93419de4534a..1549c11000d3 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -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> 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 @@ #include <linux/kernel.h> #include <linux/io.h> +#include <plat/hardware.h> #include <plat/sdrc.h> #include "iomap.h" diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c index 2c329a6f4778..1133bb2f632b 100644 --- a/arch/arm/mach-omap2/sdrc2xxx.c +++ b/arch/arm/mach-omap2/sdrc2xxx.c @@ -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> |