Looks like your PCI patch broke the PPC build (and others)?

http://marc.theaimsgroup.com/?l=linux-kernel&m=105527406918793&w=2

CC drivers/pci/probe.o
drivers/pci/probe.c: In function `pci_scan_device':
drivers/pci/probe.c:532: dereferencing pointer to incomplete type make[3]: *** [drivers/pci/probe.o] Error 1

--------------

diff -Nru a/drivers/pci/probe.c b/drivers/pci/probe.c
@@ -529,7 +529,8 @@
 	pci_name_device(dev);
 
 	/* now put in global tree */
-	strcpy(dev->dev.bus_id,dev->slot_name);
+	sprintf(dev->dev.bus_id, "%04x:%s", pci_domain_nr(bus),
+			dev->slot_name);
 	dev->dev.dma_mask = &dev->dma_mask;
 
 	return dev;

Not my patch, Matthew's :)

I think the PPC developers have a fix for this.

thanks,

greg k-h

Just #include <asm/pci-bridge.h> at the top of include/asm-ppc/pci.h. I'll push that change to Linus.

Paul.

Well... asm/pci-bridge.h includes linux/pci.h which includes asm/pci.h, so we have a circular include here...

What I did in my tree is to move the definition of pci_controller from asm/pci-bridge.h to asm/pci.h. I'm now considering removing asm/pci-bridge.h, what do you think ?

Ben.

True, but it seems that the multiple inclusion protection saves us. :)

We could do that. It might be simpler to just take pci_domain_nr out of line again though.

Paul.