summaryrefslogtreecommitdiff
path: root/include/asm-i386/zimage.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-03-26 10:41:48 +0100
committerWolfgang Denk <wd@denx.de>2008-03-26 10:41:48 +0100
commitb951f8d31711f3f10ad119ddcf5a3d0afe14d561 (patch)
tree950ca2e675ec92ea7b5610a3a2ea2b739f0aaab5 /include/asm-i386/zimage.h
parent218ca724c08ca8a649f0917cf201cf23d4b33f39 (diff)
parent27f33e9f45ef7f9685cbdc65066a1828e85dde4f (diff)
downloadolio-uboot-2014.01-b951f8d31711f3f10ad119ddcf5a3d0afe14d561.tar.xz
olio-uboot-2014.01-b951f8d31711f3f10ad119ddcf5a3d0afe14d561.zip
Merge branch 'master_merge_new-image' of /home/tur/git/u-boot
Diffstat (limited to 'include/asm-i386/zimage.h')
-rw-r--r--include/asm-i386/zimage.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-i386/zimage.h b/include/asm-i386/zimage.h
index c7103b1f3..b6266e456 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