diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-25 13:31:46 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 13:31:46 +1100 |
| commit | 16fddf5457d2a7eb5e96ceb016a8f722eca97af6 (patch) | |
| tree | ae3083a50c55f1e1a2c83f475d0e8bb2da8d7196 /lib | |
| parent | 5492a7e4cba8e38419d489f0865de0a67c737e8a (diff) | |
| parent | cc7feea39bed2951cc29af3ad642f39a99dfe8d3 (diff) | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/iomap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/iomap.c b/lib/iomap.c index db004a9ff50..dd6ca48fe6b 100644 --- a/lib/iomap.c +++ b/lib/iomap.c @@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioport_unmap); * */ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) { - unsigned long start = pci_resource_start(dev, bar); + resource_size_t start = pci_resource_start(dev, bar); unsigned long len = pci_resource_len(dev, bar); unsigned long flags = pci_resource_flags(dev, bar); |