From 4c3ae819ac14b7d48c261a1a9f1b167e43fdbcf5 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 12 Sep 2008 00:01:03 -0700
Subject: [PATCH] --- yaml --- r: 113134 b: refs/heads/master c:
 8d2aec512304144cbb4f7dbb484626fb598b698e h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sparc64/kernel/pci_sun4v.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 07aa8f96e042..3e6cbcf5323a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77d10d0e63dcc4f961cb416447d64281300e5a01
+refs/heads/master: 8d2aec512304144cbb4f7dbb484626fb598b698e
diff --git a/trunk/arch/sparc64/kernel/pci_sun4v.c b/trunk/arch/sparc64/kernel/pci_sun4v.c
index 97a77bcd2555..e86c73ec167b 100644
--- a/trunk/arch/sparc64/kernel/pci_sun4v.c
+++ b/trunk/arch/sparc64/kernel/pci_sun4v.c
@@ -942,9 +942,9 @@ static int __devinit pci_sun4v_probe(struct of_device *op,
 	dp = op->node;
 
 	if (!hvapi_negotiated++) {
-		int err = sun4v_hvapi_register(HV_GRP_PCI,
-					       vpci_major,
-					       &vpci_minor);
+		err = sun4v_hvapi_register(HV_GRP_PCI,
+					   vpci_major,
+					   &vpci_minor);
 
 		if (err) {
 			printk(KERN_ERR PFX "Could not register hvapi, "