X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=arch%2Falpha%2Fkernel%2Fsys_nautilus.c;h=99c0f46f6b9cc75007499c10f4fb84f8a2c6d1ee;hb=891393745aad5c5acdb01b6ce61c08d4cc064649;hp=a7f23b5ab814580a480bb5c7b6b932d3227f828c;hpb=064922a805ec7aadfafdd27aa6b4908d737c3c1d;p=linux-2.6-omap-h63xx.git

diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index a7f23b5ab81..99c0f46f6b9 100644
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/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);
 }