summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/zimage.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-07-15 14:41:20 (GMT)
committerTom Rini <trini@konsulko.com>2015-07-15 14:41:20 (GMT)
commit605e15db2b54302364a2528d3c6604fbc57be846 (patch)
tree1a1e344964bff1719939183124d66a71e7ca7731 /arch/x86/include/asm/zimage.h
parent4905dfc65d9a17083727865302d2cf633c15c911 (diff)
parentf110da9984c0aa0aba9e1c4178b67b7abecf7e8d (diff)
downloadu-boot-605e15db2b54302364a2528d3c6604fbc57be846.tar.xz
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/include/asm/zimage.h')
-rw-r--r--arch/x86/include/asm/zimage.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h
index 8e7dd42..bf351ed 100644
--- a/arch/x86/include/asm/zimage.h
+++ b/arch/x86/include/asm/zimage.h
@@ -38,5 +38,6 @@ struct boot_params *load_zimage(char *image, unsigned long kernel_size,
ulong *load_addressp);
int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
unsigned long initrd_addr, unsigned long initrd_size);
+void setup_video(struct screen_info *screen_info);
#endif