summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/main.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-03 09:11:13 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-03 09:11:13 +0100
commit36609469c8278554b046aa4cc9a5fa9ccea35306 (patch)
treef59185b71c8059941de79143f71178453599b8f1 /arch/powerpc/boot/main.c
parentb3acf29afda06c76774dc6df6246c37ae707836b (diff)
parent45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff)
downloadtalos-op-linux-36609469c8278554b046aa4cc9a5fa9ccea35306.tar.gz
talos-op-linux-36609469c8278554b046aa4cc9a5fa9ccea35306.zip
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'arch/powerpc/boot/main.c')
-rw-r--r--arch/powerpc/boot/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index ae32801ebd69..a28f02165e97 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -63,7 +63,7 @@ static struct addr_range prep_kernel(void)
*/
if ((unsigned long)_start < ei.loadsize)
fatal("Insufficient memory for kernel at address 0!"
- " (_start=%p, uncomressed size=%08x)\n\r",
+ " (_start=%p, uncompressed size=%08lx)\n\r",
_start, ei.loadsize);
if ((unsigned long)_end < ei.memsize)
OpenPOWER on IntegriCloud