diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 11:45:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 11:45:42 -0500 |
| commit | d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d (patch) | |
| tree | 092bf1f6cd50db2272d12ad6991ac3465f2d19ef /arch/arm/plat-omap/sram-fn.S | |
| parent | fbf0e1348ec4023675123d432ce1fdfa1eef8e54 (diff) | |
| parent | 5470dc656820fb67c0a2e352f0aaa48b86c19026 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/plat-omap/sram-fn.S')
| -rw-r--r-- | arch/arm/plat-omap/sram-fn.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/plat-omap/sram-fn.S index 4bea36964a00..66414cc8e6e3 100644 --- a/arch/arm/plat-omap/sram-fn.S +++ b/arch/arm/plat-omap/sram-fn.S | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 13 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
| 14 | #include <asm/arch/io.h> | 14 | #include <asm/arch/io.h> |
| 15 | #include <asm/arch/hardware.h> | 15 | #include <asm/hardware.h> |
| 16 | 16 | ||
| 17 | .text | 17 | .text |
| 18 | 18 | ||