From a369f4a492fa2805d87775d27380f0eeaca35aa6 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Mon, 29 Sep 2008 23:03:14 +1000 Subject: i386: Renamed show_boot_progress in assembler code Renamed show_boot_progress in assembler init phase to show_boot_progress_asm to avoid link conflicts with C version Signed-off-by: Graeme Russ --- board/sc520_spunk/sc520_spunk_asm.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'board/sc520_spunk') diff --git a/board/sc520_spunk/sc520_spunk_asm.S b/board/sc520_spunk/sc520_spunk_asm.S index 3430b6a..eda7e91 100644 --- a/board/sc520_spunk/sc520_spunk_asm.S +++ b/board/sc520_spunk/sc520_spunk_asm.S @@ -73,8 +73,8 @@ done: movl $0xfffefc32,%edx jmp *%ebp /* return to caller */ -.globl show_boot_progress -show_boot_progress: +.globl show_boot_progress_asm +show_boot_progress_asm: movl $0xfffefc32,%edx xorw $0xffff, %ax movw %ax,(%edx) -- cgit v1.1