X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fpci%2Fprobe.c;h=3dc00f0ca8a0e2b0f2374edc9b092048d700e68c;hb=c431ada45d65b305a6aab4557067e564b23ce5a5;hp=b7ae87823c69777f772717947b6911ffdeac6b2b;hpb=742b0c905d970fd60893cce14a3c68b523504bc4;p=linux-2.6 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b7ae87823c..3dc00f0ca8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -125,7 +125,7 @@ static inline unsigned int pci_calc_resource_flags(unsigned int flags) /* * Find the extent of a PCI decode.. */ -static u32 pci_size(u32 base, u32 maxbase, unsigned long mask) +static u32 pci_size(u32 base, u32 maxbase, u32 mask) { u32 size = mask & maxbase; /* Find the significant bits */ if (!size) @@ -911,8 +911,6 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, int bus, b->subordinate = pci_scan_child_bus(b); - pci_bus_add_devices(b); - return b; sys_create_link_err: