diff options
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/pci.c | 5 | ||||
| -rw-r--r-- | arch/sparc/kernel/pcic.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 592b03d85167..d56c1f34689e 100644 --- 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) | |||
| 722 | { | 722 | { |
| 723 | } | 723 | } |
| 724 | 724 | ||
| 725 | void pcibios_align_resource(void *data, struct resource *res, | 725 | resource_size_t pcibios_align_resource(void *data, struct resource *res, |
| 726 | resource_size_t size, resource_size_t align) | 726 | resource_size_t size, resource_size_t align) |
| 727 | { | 727 | { |
| 728 | return res->start; | ||
| 728 | } | 729 | } |
| 729 | 730 | ||
| 730 | int pcibios_enable_device(struct pci_dev *dev, int mask) | 731 | int pcibios_enable_device(struct pci_dev *dev, int mask) |
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) | |||
| 768 | return str; | 768 | return str; |
| 769 | } | 769 | } |
| 770 | 770 | ||
| 771 | void pcibios_align_resource(void *data, struct resource *res, | 771 | resource_size_t pcibios_align_resource(void *data, struct resource *res, |
| 772 | resource_size_t size, resource_size_t align) | 772 | resource_size_t size, resource_size_t align) |
| 773 | { | 773 | { |
| 774 | return res->start; | ||
| 774 | } | 775 | } |
| 775 | 776 | ||
| 776 | int pcibios_enable_device(struct pci_dev *pdev, int mask) | 777 | int pcibios_enable_device(struct pci_dev *pdev, int mask) |