diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 08:41:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 08:41:25 -0800 |
commit | 7b286af3921e13da4838cdb451639b959c187c82 (patch) | |
tree | bd995c9219e69823d09fd222c6ebeb05dd225c43 /arch/mips/au1000/common/pci.c | |
parent | 6e3013932e97a0e034d55419c60ae4a8a229ceb8 (diff) | |
parent | bbaf238b5f910f8f3dda4b96cf844f50b2dcc6fa (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Ensure that ST0_FR is never set on a 32 bit kernel
[MIPS] time: Delete weak definition of plat_time_init() due to gcc bug.
[MIPS] PCI: Make pcibios_fixup_device_resources ignore legacy resources.
[MIPS] Atlas, Malta: Don't free firmware memory on free_initmem.
[MIPS] Alchemy: fix off by two error in __fixup_bigphys_addr()
[MIPS] Alchemy: fix PCI resource conflict
[MIPS] time: Set up Cobalt's mips_hpt_frequency
Diffstat (limited to 'arch/mips/au1000/common/pci.c')
-rw-r--r-- | arch/mips/au1000/common/pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c index 9be99a68932..6fa70a36a25 100644 --- a/arch/mips/au1000/common/pci.c +++ b/arch/mips/au1000/common/pci.c @@ -39,15 +39,15 @@ /* TBD */ static struct resource pci_io_resource = { - .start = (resource_size_t)PCI_IO_START, - .end = (resource_size_t)PCI_IO_END, + .start = PCI_IO_START, + .end = PCI_IO_END, .name = "PCI IO space", .flags = IORESOURCE_IO }; static struct resource pci_mem_resource = { - .start = (resource_size_t)PCI_MEM_START, - .end = (resource_size_t)PCI_MEM_END, + .start = PCI_MEM_START, + .end = PCI_MEM_END, .name = "PCI memory space", .flags = IORESOURCE_MEM }; |