diff options
Diffstat (limited to 'arch/mips/pmc-sierra/yosemite/ht.c')
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/ht.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/ht.c b/arch/mips/pmc-sierra/yosemite/ht.c index 678388fd34b1..63be40e470db 100644 --- a/arch/mips/pmc-sierra/yosemite/ht.c +++ b/arch/mips/pmc-sierra/yosemite/ht.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
29 | #include <linux/slab.h> | ||
30 | #include <asm/pci.h> | 29 | #include <asm/pci.h> |
31 | #include <asm/io.h> | 30 | #include <asm/io.h> |
32 | 31 | ||
@@ -345,14 +344,13 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
345 | return pcibios_enable_resources(dev); | 344 | return pcibios_enable_resources(dev); |
346 | } | 345 | } |
347 | 346 | ||
348 | void pcibios_align_resource(void *data, struct resource *res, | 347 | resource_size_t pcibios_align_resource(void *data, const struct resource *res, |
349 | resource_size_t size, resource_size_t align) | 348 | resource_size_t size, resource_size_t align) |
350 | { | 349 | { |
351 | struct pci_dev *dev = data; | 350 | struct pci_dev *dev = data; |
351 | resource_size_t start = res->start; | ||
352 | 352 | ||
353 | if (res->flags & IORESOURCE_IO) { | 353 | if (res->flags & IORESOURCE_IO) { |
354 | resource_size_t start = res->start; | ||
355 | |||
356 | /* We need to avoid collisions with `mirrored' VGA ports | 354 | /* We need to avoid collisions with `mirrored' VGA ports |
357 | and other strange ISA hardware, so we always want the | 355 | and other strange ISA hardware, so we always want the |
358 | addresses kilobyte aligned. */ | 356 | addresses kilobyte aligned. */ |
@@ -363,8 +361,9 @@ void pcibios_align_resource(void *data, struct resource *res, | |||
363 | } | 361 | } |
364 | 362 | ||
365 | start = (start + 1024 - 1) & ~(1024 - 1); | 363 | start = (start + 1024 - 1) & ~(1024 - 1); |
366 | res->start = start; | ||
367 | } | 364 | } |
365 | |||
366 | return start; | ||
368 | } | 367 | } |
369 | 368 | ||
370 | struct pci_ops titan_pci_ops = { | 369 | struct pci_ops titan_pci_ops = { |