---

yaml --- r: 129690 b: refs/heads/master c: 2f88d15 h: refs/heads/master v: v3
git-mirror · Jan 16, 2009 · 6142874 · 6142874
1 parent 22b7f94
commit 6142874
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70b66cbfd3316b792a855cb9a2574e85f1a63d0f
+refs/heads/master: 2f88d151cb8e73587983d7feccd70672ff6730fe
diff --git a/trunk/arch/alpha/kernel/sys_nautilus.c b/trunk/arch/alpha/kernel/sys_nautilus.c
@@ -245,6 +245,10 @@ nautilus_init_pci(void)
 		IRONGATE0->pci_mem = pci_mem;
 
 	pci_bus_assign_resources(bus);
+
+	/* pci_common_swizzle() relies on bus->self being NULL
+	   for the root bus, so just clear it. */
+	bus->self = NULL;
 	pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);
 }