aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm26/nwfpe
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 18:46:49 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 18:46:49 -0400
commit486a153f0e294f7cc735838edcb6b32e623cbe52 (patch)
treef16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/arm26/nwfpe
parent9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff)
parentf64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/arm26/nwfpe')
-rw-r--r--arch/arm26/nwfpe/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm26/nwfpe/entry.S b/arch/arm26/nwfpe/entry.S
index 7d6dfaad80c2..e6312000d9f8 100644
--- a/arch/arm26/nwfpe/entry.S
+++ b/arch/arm26/nwfpe/entry.S
@@ -20,7 +20,7 @@
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21*/ 21*/
22 22
23#include <asm/asm_offsets.h> 23#include <asm/asm-offsets.h>
24 24
25/* This is the kernel's entry point into the floating point emulator. 25/* This is the kernel's entry point into the floating point emulator.
26It is called from the kernel with code similar to this: 26It is called from the kernel with code similar to this: