diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /include/asm-mips/lasat/head.h | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'include/asm-mips/lasat/head.h')
| -rw-r--r-- | include/asm-mips/lasat/head.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/asm-mips/lasat/head.h b/include/asm-mips/lasat/head.h deleted file mode 100644 index f5589f31a197..000000000000 --- a/include/asm-mips/lasat/head.h +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Image header stuff | ||
| 3 | */ | ||
| 4 | #ifndef _HEAD_H | ||
| 5 | #define _HEAD_H | ||
| 6 | |||
| 7 | #define LASAT_K_MAGIC0_VAL 0xfedeabba | ||
| 8 | #define LASAT_K_MAGIC1_VAL 0x00bedead | ||
| 9 | |||
| 10 | #ifndef _LANGUAGE_ASSEMBLY | ||
| 11 | #include <linux/types.h> | ||
| 12 | struct bootloader_header { | ||
| 13 | u32 magic[2]; | ||
| 14 | u32 version; | ||
| 15 | u32 image_start; | ||
| 16 | u32 image_size; | ||
| 17 | u32 kernel_start; | ||
| 18 | u32 kernel_entry; | ||
| 19 | }; | ||
| 20 | #endif | ||
| 21 | |||
| 22 | #endif /* _HEAD_H */ | ||