diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-03 20:36:04 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-03 20:36:04 +0100 |
| commit | e84fb175f671d2dc9a0b2253ac28b85a2f3620cd (patch) | |
| tree | f4c11f508d0b6e2181595a887ccbb7dc004b976e /arch/x86/lib/realmode.c | |
| parent | b2b4449aa7fcbf2b3042cd9100f5857d89480812 (diff) | |
| parent | 4c1c355a68d102e900617639d702c35390564355 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
* 'master' of git://git.denx.de/u-boot-x86:
x86: Fix a compiler warning in arch/x86/lib/realmode.c
x86: Remove the prototype for the unused function board_init
x86: Rename include/asm/ic to include/asm/arch-sc520
x86: turn off cache: set control register properly
Diffstat (limited to 'arch/x86/lib/realmode.c')
| -rw-r--r-- | arch/x86/lib/realmode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/realmode.c b/arch/x86/lib/realmode.c index c1133934155..6aa0f23a1a4 100644 --- a/arch/x86/lib/realmode.c +++ b/arch/x86/lib/realmode.c @@ -41,7 +41,7 @@ int realmode_setup(void) if (realmode_size > (REALMODE_MAILBOX - (char *)REALMODE_BASE)) { printf("realmode switch too large (%ld bytes, max is %d)\n", realmode_size, - (REALMODE_MAILBOX - (char *)REALMODE_BASE)); + (int)(REALMODE_MAILBOX - (char *)REALMODE_BASE)); return -1; } |