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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
microblaze
/
kernel
/
cpu
/
pvr.c
diff --git
a/arch/microblaze/kernel/cpu/pvr.c
b/arch/microblaze/kernel/cpu/pvr.c
index
9bee938
..
e01afa6
100644
(file)
--- a/
arch/microblaze/kernel/cpu/pvr.c
+++ b/
arch/microblaze/kernel/cpu/pvr.c
@@
-27,7
+27,7
@@
register unsigned tmp __asm__("r3"); \
tmp = 0x0; /* Prevent warning about unused */ \
__asm__ __volatile__ ( \
- "
.byte 0x94,0x60,0xa0, " #pvrid "\n\t"
\
+ "
mfs %0, rpvr" #pvrid ";"
\
: "=r" (tmp) : : "memory"); \
val = tmp; \
}