From 5f9c22c63fde18b3fe93b1fc2866af330334500e Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Sat, 11 Feb 2006 23:38:00 -0800
Subject: [PATCH] --- yaml --- r: 21423 b: refs/heads/master c:
 221b2fb818c307e1cb47e036a1671ca554d9cd0a h: refs/heads/master i:   21421:
 081feed8746a2a85b7e7ba05c01fda29bd29f732   21419:
 dceaffa3fceb110adea79dcace0b54221b47bb7b   21415:
 f71b0c72a68c18a1e0aa3805ecd05112680e2f3c   21407:
 bcdc1b91016c2c5c6940a0df802944923e5b455a v: v3

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

diff --git a/[refs] b/[refs]
index 715663142c76..7fcc783d95aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6241e5cc6afe2c5b75b51e1c890df18f05838cf6
+refs/heads/master: 221b2fb818c307e1cb47e036a1671ca554d9cd0a
diff --git a/trunk/arch/sparc64/kernel/pci_sun4v.c b/trunk/arch/sparc64/kernel/pci_sun4v.c
index 3f0e3c09f4d3..699e91e3e429 100644
--- a/trunk/arch/sparc64/kernel/pci_sun4v.c
+++ b/trunk/arch/sparc64/kernel/pci_sun4v.c
@@ -639,9 +639,9 @@ static void pci_sun4v_resource_adjust(struct pci_dev *pdev,
  */
 static void pci_sun4v_determine_mem_io_space(struct pci_pbm_info *pbm)
 {
-	int i, saw_cfg, saw_mem, saw_io;
+	int i, saw_mem, saw_io;
 
-	saw_cfg = saw_mem = saw_io = 0;
+	saw_mem = saw_io = 0;
 	for (i = 0; i < pbm->num_pbm_ranges; i++) {
 		struct linux_prom_pci_ranges *pr = &pbm->pbm_ranges[i];
 		unsigned long a;
@@ -652,12 +652,6 @@ static void pci_sun4v_determine_mem_io_space(struct pci_pbm_info *pbm)
 		     ((unsigned long)pr->parent_phys_lo  <<  0UL));
 
 		switch (type) {
-		case 0:
-			/* PCI config space, 16MB */
-			pbm->config_space = a;
-			saw_cfg = 1;
-			break;
-
 		case 1:
 			/* 16-bit IO space, 16MB */
 			pbm->io_space.start = a;
@@ -679,19 +673,15 @@ static void pci_sun4v_determine_mem_io_space(struct pci_pbm_info *pbm)
 		};
 	}
 
-	if (!saw_cfg || !saw_io || !saw_mem) {
+	if (!saw_io || !saw_mem) {
 		prom_printf("%s: Fatal error, missing %s PBM range.\n",
 			    pbm->name,
-			    ((!saw_cfg ?
-			      "CFG" :
-			      (!saw_io ?
-			       "IO" : "MEM"))));
+			    (!saw_io ? "IO" : "MEM"));
 		prom_halt();
 	}
 
-	printk("%s: PCI CFG[%lx] IO[%lx] MEM[%lx]\n",
+	printk("%s: PCI IO[%lx] MEM[%lx]\n",
 	       pbm->name,
-	       pbm->config_space,
 	       pbm->io_space.start,
 	       pbm->mem_space.start);
 }