git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
sh
/
drivers
/
pci
/
pci.c
diff --git
a/arch/sh/drivers/pci/pci.c
b/arch/sh/drivers/pci/pci.c
index
c166990
..
3d546ba
100644
(file)
--- a/
arch/sh/drivers/pci/pci.c
+++ b/
arch/sh/drivers/pci/pci.c
@@
-75,7
+75,7
@@
pcibios_update_resource(struct pci_dev *dev, struct resource *root,
}
void pcibios_align_resource(void *data, struct resource *res,
}
void pcibios_align_resource(void *data, struct resource *res,
-
unsigned long size, unsigned long
align)
+
resource_size_t size, resource_size_t
align)
__attribute__ ((weak));
/*
__attribute__ ((weak));
/*
@@
-85,10
+85,10
@@
void pcibios_align_resource(void *data, struct resource *res,
* modulo 0x400.
*/
void pcibios_align_resource(void *data, struct resource *res,
* modulo 0x400.
*/
void pcibios_align_resource(void *data, struct resource *res,
-
unsigned long size, unsigned long
align)
+
resource_size_t size, resource_size_t
align)
{
if (res->flags & IORESOURCE_IO) {
{
if (res->flags & IORESOURCE_IO) {
-
unsigned long
start = res->start;
+
resource_size_t
start = res->start;
if (start & 0x300) {
start = (start + 0x3ff) & ~0x3ff;
if (start & 0x300) {
start = (start + 0x3ff) & ~0x3ff;