From 40eabd351d96d1d63a92b6b641dfe2e39b6eb035 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Wed, 4 Oct 2006 13:27:45 -0600 Subject: [PATCH] --- yaml --- r: 39005 b: refs/heads/master c: ccd6c355e89a21d9047ae19471629758d3a01959 h: refs/heads/master i: 39003: 5b8c29fe35e1c255a1bd640e0124e1a058b1e20d v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 668300180e60..9c27bc58bd2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15c130c1cde38da528f82efce882e8d7632f4d91 +refs/heads/master: ccd6c355e89a21d9047ae19471629758d3a01959 diff --git a/trunk/arch/parisc/kernel/pci.c b/trunk/arch/parisc/kernel/pci.c index d3b8fc52dfc1..199887a61c76 100644 --- a/trunk/arch/parisc/kernel/pci.c +++ b/trunk/arch/parisc/kernel/pci.c @@ -290,7 +290,7 @@ EXPORT_SYMBOL(pcibios_bus_to_resource); void pcibios_align_resource(void *data, struct resource *res, resource_size_t size, resource_size_t alignment) { - unsigned long mask, align; + resource_size_t mask, align; DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n", pci_name(((struct pci_dev *) data)),