git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
microblaze
/
kernel
/
setup.c
diff --git
a/arch/microblaze/kernel/setup.c
b/arch/microblaze/kernel/setup.c
index
bb1558e
..
9312fbb
100644
(file)
--- a/
arch/microblaze/kernel/setup.c
+++ b/
arch/microblaze/kernel/setup.c
@@
-161,11
+161,11
@@
void __init machine_early_init(const char *cmdline, unsigned int ram,
#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
if (msr)
eprintk("!!!Your kernel has setup MSR instruction but "
#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
if (msr)
eprintk("!!!Your kernel has setup MSR instruction but "
- "CPU don't have it %
d
\n", msr);
+ "CPU don't have it %
x
\n", msr);
#else
if (!msr)
eprintk("!!!Your kernel not setup MSR instruction but "
#else
if (!msr)
eprintk("!!!Your kernel not setup MSR instruction but "
- "CPU have it %
d
\n", msr);
+ "CPU have it %
x
\n", msr);
#endif
for (src = __ivt_start; src < __ivt_end; src++, dst++)
#endif
for (src = __ivt_start; src < __ivt_end; src++, dst++)