diff options
author | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:27:01 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:27:01 -0800 |
commit | a5bee307ba7befc96a97915d6d45ffbe1e5f9a20 (patch) | |
tree | 544713c8b4359221df3677fb93a52892c57fbcee /arch/arm/mach-omap1/sram.S | |
parent | 0aac881246fb25d017617cd7be68e93326d51ce1 (diff) | |
parent | acea7c7b81e8f67513aebade8cb99c7789c44d8c (diff) |
Merge branch 'iomap' into cleanup
Diffstat (limited to 'arch/arm/mach-omap1/sram.S')
-rw-r--r-- | arch/arm/mach-omap1/sram.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/sram.S b/arch/arm/mach-omap1/sram.S index 692587d07ea5..2ce0b9ab20e5 100644 --- a/arch/arm/mach-omap1/sram.S +++ b/arch/arm/mach-omap1/sram.S @@ -9,10 +9,14 @@ */ #include <linux/linkage.h> + #include <asm/assembler.h> + #include <mach/io.h> #include <mach/hardware.h> +#include "iomap.h" + .text /* |