aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2006-10-04 15:27:45 -0400
committerMatthew Wilcox <willy@hera.kernel.org>2006-10-04 21:48:18 -0400
commitccd6c355e89a21d9047ae19471629758d3a01959 (patch)
tree3e5a2622bc36bf896e6aaf577aca72a15f51e519 /arch/parisc/kernel
parent15c130c1cde38da528f82efce882e8d7632f4d91 (diff)
[PA-RISC] Remove warning from pci.c
max() doesn't like comparing an unsigned long and a resource_size_t, so make the local variables resource_size_t too. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r--arch/parisc/kernel/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c
index d3b8fc52dfc1..199887a61c76 100644
--- a/arch/parisc/kernel/pci.c
+++ b/arch/parisc/kernel/pci.c
@@ -290,7 +290,7 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
290void pcibios_align_resource(void *data, struct resource *res, 290void pcibios_align_resource(void *data, struct resource *res,
291 resource_size_t size, resource_size_t alignment) 291 resource_size_t size, resource_size_t alignment)
292{ 292{
293 unsigned long mask, align; 293 resource_size_t mask, align;
294 294
295 DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n", 295 DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n",
296 pci_name(((struct pci_dev *) data)), 296 pci_name(((struct pci_dev *) data)),