diff --git a/[refs] b/[refs] index eddda7921cd5..71ca3d500512 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3c77c67a443e631febf708bb0c376caede31657 +refs/heads/master: f797f9cc5485b50c35c106b462e1bc432ec37f90 diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index b7ae87823c69..fd48b201eb53 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/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)