diff options
| author | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 09:38:06 +0100 |
|---|---|---|
| committer | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 09:38:06 +0100 |
| commit | 27f33e9f45ef7f9685cbdc65066a1828e85dde4f (patch) | |
| tree | 5828044d71e5caa3bec4d05c6c48793df0cd17a3 /include/asm-i386 | |
| parent | 18e69a35efbb078403db0c0063986470dad7d082 (diff) | |
| parent | 388b82fddc7c05596f3f615f190da0448227dc82 (diff) | |
| download | u-boot-imx-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.zip u-boot-imx-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.tar.gz u-boot-imx-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.tar.bz2 | |
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts:
common/cmd_bootm.c
cpu/mpc8xx/cpu.c
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/zimage.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-i386/zimage.h b/include/asm-i386/zimage.h index c7103b1..b6266e4 100644 --- a/include/asm-i386/zimage.h +++ b/include/asm-i386/zimage.h @@ -70,6 +70,5 @@ void *load_zimage(char *image, unsigned long kernel_size, int auto_boot); void boot_zimage(void *setup_base); -image_header_t *fake_zimage_header(image_header_t *hdr, void *ptr, int size); #endif |