diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 07:43:03 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 07:43:03 +0100 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /arch/powerpc/boot/main.c | |
| parent | pkt_sched: Fix qdisc len in qdisc_peek_dequeued() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-9eeda9abd1faf489f3df9a1f557975f4c8650363.tar.xz linux-9eeda9abd1faf489f3df9a1f557975f4c8650363.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'arch/powerpc/boot/main.c')
| -rw-r--r-- | arch/powerpc/boot/main.c | 2 |
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) |