summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2006-06-13 02:06:02 +0200
committerGreg Kroah-Hartman2006-06-27 18:24:00 +0200
commite31dd6e4520439ceae4753f32dd2da2c345e929a (patch)
treefea87cfb0077135c6dcaf7849e518ee31733b0fc /arch/m68knommu
parent[PATCH] 64bit resource: change resource core to use resource_size_t (diff)
downloadkernel-qcow2-linux-e31dd6e4520439ceae4753f32dd2da2c345e929a.tar.gz
kernel-qcow2-linux-e31dd6e4520439ceae4753f32dd2da2c345e929a.tar.xz
kernel-qcow2-linux-e31dd6e4520439ceae4753f32dd2da2c345e929a.zip
[PATCH] 64bit resource: change pci core and arch code to use resource_size_t
Based on a patch series originally from Vivek Goyal <vgoyal@in.ibm.com> Cc: Vivek Goyal <vgoyal@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r--arch/m68knommu/kernel/comempci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/comempci.c b/arch/m68knommu/kernel/comempci.c
index 8670938f1107..db7a0c1cebae 100644
--- a/arch/m68knommu/kernel/comempci.c
+++ b/arch/m68knommu/kernel/comempci.c
@@ -357,7 +357,8 @@ void pcibios_fixup_bus(struct pci_bus *b)
/*****************************************************************************/
-void pcibios_align_resource(void *data, struct resource *res, unsigned long size, unsigned long align)
+void pcibios_align_resource(void *data, struct resource *res,
+ resource_size_t size, resource_size_t align)
{
}