Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / microblaze / kernel / cpu / pvr.c

diff --git a/arch/microblaze/kernel/cpu/pvr.c b/arch/microblaze/kernel/cpu/pvr.c
index 9bee9382bf74587031e01fde8e828f243683d147..e01afa68273ede2302d7cd6da97f0c63430f7eaa 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;                                              \
 }