Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

[karo-tx-linux.git] / arch / sparc / kernel / pci.c

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index d7e1cf01dd2844849b36a4c302b70d4fb817d8fc..5ac539a5930f5401239d81f2e1bfff217472a60e 100644 (file)
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -722,9 +722,10 @@ void pcibios_update_irq(struct pci_dev *pdev, int irq)
 {
 }
 
-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, const struct resource *res,
+                               resource_size_t size, resource_size_t align)
 {
+       return res->start;
 }
 
 int pcibios_enable_device(struct pci_dev *dev, int mask)