aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-12 03:01:03 -0400
committerDavid S. Miller <davem@davemloft.net>2008-09-12 03:01:03 -0400
commit8d2aec512304144cbb4f7dbb484626fb598b698e (patch)
tree9a9361d3093dc3241327220a1d51b24e9b367314 /arch/sparc64
parent77d10d0e63dcc4f961cb416447d64281300e5a01 (diff)
sparc64: Fix sparse warnings in pci_sun4v.c
'err' variable shadowing in pci_sun4v_probe() Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/kernel/pci_sun4v.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 97a77bcd2555..e86c73ec167b 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -942,9 +942,9 @@ static int __devinit pci_sun4v_probe(struct of_device *op,
942 dp = op->node; 942 dp = op->node;
943 943
944 if (!hvapi_negotiated++) { 944 if (!hvapi_negotiated++) {
945 int err = sun4v_hvapi_register(HV_GRP_PCI, 945 err = sun4v_hvapi_register(HV_GRP_PCI,
946 vpci_major, 946 vpci_major,
947 &vpci_minor); 947 &vpci_minor);
948 948
949 if (err) { 949 if (err) {
950 printk(KERN_ERR PFX "Could not register hvapi, " 950 printk(KERN_ERR PFX "Could not register hvapi, "