diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 | 
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 | 
| commit | 857c68f733eea07f11a061caea43a38fed61adb7 (patch) | |
| tree | 4567a9e91f717b22143ac1ccb0fb5323ac15afd3 /arch/mips/dec/boot/decstation.c | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
| parent | 402a26f0c040077ed6f941eefac5a6971f0d5f40 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/dec/boot/decstation.c')
| -rw-r--r-- | arch/mips/dec/boot/decstation.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/arch/mips/dec/boot/decstation.c b/arch/mips/dec/boot/decstation.c index 56fd4277555e..4db8bacaf22d 100644 --- a/arch/mips/dec/boot/decstation.c +++ b/arch/mips/dec/boot/decstation.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* | 1 | /* | 
| 2 | * arch/mips/dec/decstation.c | 2 | * arch/mips/dec/decstation.c | 
| 3 | */ | 3 | */ | 
| 4 | #include <asm/sections.h> | ||
| 4 | 5 | ||
| 5 | #define RELOC | 6 | #define RELOC | 
| 6 | #define INITRD | 7 | #define INITRD | 
| @@ -24,7 +25,7 @@ | |||
| 24 | #define INITRD_START (*(unsigned long *) (PARAM+0x218)) | 25 | #define INITRD_START (*(unsigned long *) (PARAM+0x218)) | 
| 25 | #define INITRD_SIZE (*(unsigned long *) (PARAM+0x21c)) | 26 | #define INITRD_SIZE (*(unsigned long *) (PARAM+0x21c)) | 
| 26 | 27 | ||
| 27 | extern int _ftext, _end; /* begin and end of kernel image */ | 28 | extern int _ftext; /* begin and end of kernel image */ | 
| 28 | extern void kernel_entry(int, char **, unsigned long, int *); | 29 | extern void kernel_entry(int, char **, unsigned long, int *); | 
| 29 | 30 | ||
| 30 | void * memcpy(void * dest, const void *src, unsigned int count) | 31 | void * memcpy(void * dest, const void *src, unsigned int count) | 
