From 2fb3057a09887b12f44eb41f1bc1b96cadcd32ed Mon Sep 17 00:00:00 2001
From: Marc Zyngier <maz@misterjones.org>
Date: Fri, 14 Jul 2006 16:53:50 -0700
Subject: [PATCH] --- yaml --- r: 32687 b: refs/heads/master c:
 ee7022dcfbf660727d6b8553cb0dbc0d4eae8f44 h: refs/heads/master i:   32685:
 74adf2882673298135326109637658151f9d81ed   32683:
 b3ff022cb8f46a65e686336e0ad7eb35aa49a035   32679:
 df66419e57a8e0ff5e659fa6f129165bec505c87   32671:
 bffff5b169a37aa8059a13a121dd0ffe3079be02 v: v3

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

diff --git a/[refs] b/[refs]
index 5d969ac2fd63..81ac8224d7a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a49261585e2c89f16b5a4bb80f623d2e9c2c1566
+refs/heads/master: ee7022dcfbf660727d6b8553cb0dbc0d4eae8f44
diff --git a/trunk/arch/sparc64/kernel/pci_psycho.c b/trunk/arch/sparc64/kernel/pci_psycho.c
index 83f88ad4ffa5..1ec0aab68c08 100644
--- a/trunk/arch/sparc64/kernel/pci_psycho.c
+++ b/trunk/arch/sparc64/kernel/pci_psycho.c
@@ -1200,12 +1200,13 @@ static void psycho_pbm_init(struct pci_controller_info *p,
 	pbm->io_space.flags = IORESOURCE_IO;
 	pbm->mem_space.end = pbm->mem_space.start + PSYCHO_MEMSPACE_SIZE;
 	pbm->mem_space.flags = IORESOURCE_MEM;
-	pbm_register_toplevel_resources(p, pbm);
 
 	pbm->parent = p;
 	pbm->prom_node = dp;
 	pbm->name = dp->full_name;
 
+	pbm_register_toplevel_resources(p, pbm);
+
 	printk("%s: PSYCHO PCI Bus Module ver[%x:%x]\n",
 	       pbm->name,
 	       pbm->chip_version, pbm->chip_revision);