diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 13:45:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 13:45:22 -0500 |
| commit | 8995b161eb142b843094dd614b80e4cce1d66352 (patch) | |
| tree | ffd9988879441d5ec45ab96b2e06f4fcb1210158 /arch/arm/kernel/entry-armv.S | |
| parent | cc918c7ab7da017bfaf9661420bb5c462e057cfb (diff) | |
| parent | fe5dd7c73d328b255286b6b65ca19dd34447f709 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 2a8d27e18fa7..a52baedf6262 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
| @@ -18,8 +18,6 @@ | |||
| 18 | #include <asm/memory.h> | 18 | #include <asm/memory.h> |
| 19 | #include <asm/glue.h> | 19 | #include <asm/glue.h> |
| 20 | #include <asm/vfpmacros.h> | 20 | #include <asm/vfpmacros.h> |
| 21 | #include <asm/hardware.h> /* should be moved into entry-macro.S */ | ||
| 22 | #include <asm/arch/irqs.h> /* should be moved into entry-macro.S */ | ||
| 23 | #include <asm/arch/entry-macro.S> | 21 | #include <asm/arch/entry-macro.S> |
| 24 | 22 | ||
| 25 | #include "entry-header.S" | 23 | #include "entry-header.S" |