From 1c11df6458aa0fc27a49781332007de9429e718f Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Mon, 7 Feb 2011 11:29:43 +0100
Subject: [PATCH] --- yaml --- r: 233149 b: refs/heads/master c:
 1649700408531ec64ae33af55a1091db50d1f7da h: refs/heads/master i:   233147:
 33b55f057aba1439d06d4c996bde210b8b71153d v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/microblaze/kernel/cpu/pvr.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7e420f34076e..7e045d64c602 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12dfc73e1ddb44b2d23e0ca614b6ec50596adae0
+refs/heads/master: 1649700408531ec64ae33af55a1091db50d1f7da
diff --git a/trunk/arch/microblaze/kernel/cpu/pvr.c b/trunk/arch/microblaze/kernel/cpu/pvr.c
index e01afa68273e..488c1ed24e38 100644
--- a/trunk/arch/microblaze/kernel/cpu/pvr.c
+++ b/trunk/arch/microblaze/kernel/cpu/pvr.c
@@ -27,7 +27,7 @@
 	register unsigned tmp __asm__("r3");			\
 	tmp = 0x0;	/* Prevent warning about unused */	\
 	__asm__ __volatile__ (					\
-			"mfs	%0, rpvr" #pvrid ";"	\
+			"mfs	%0, rpvr" #pvrid ";"		\
 			: "=r" (tmp) : : "memory"); 		\
 	val = tmp;						\
 }
@@ -54,7 +54,7 @@ int cpu_has_pvr(void)
 	if (!(flags & PVR_MSR_BIT))
 		return 0;
 
-	get_single_pvr(0x00, pvr0);
+	get_single_pvr(0, pvr0);
 	pr_debug("%s: pvr0 is 0x%08x\n", __func__, pvr0);
 
 	if (pvr0 & PVR0_PVR_FULL_MASK)