X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fsparc%2Fkernel%2Fpcic.c;h=46fda64ff16359212f8e4aa0de5c60e5b8ff0266;hb=b26b2d494b659f988b4d75eb394dfa0ddac415c9;hp=4e2724ec2bb6d6c3e660cf06feb7c62b1953fed1;hpb=0ea457839d050370e0f7c75c81f9abd573e1f420;p=deliverable%2Flinux.git

diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 4e2724ec2bb6..46fda64ff163 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -768,9 +768,10 @@ char * __devinit pcibios_setup(char *str)
 	return str;
 }
 
-void pcibios_align_resource(void *data, struct resource *res,
-			    resource_size_t size, resource_size_t align)
+resource_size_t pcibios_align_resource(void *data, struct resource *res,
+				resource_size_t size, resource_size_t align)
 {
+	return res->start;
 }
 
 int pcibios_enable_device(struct pci_dev *pdev, int mask)