diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 17:19:40 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 17:19:40 +0200 |
| commit | d636b2798732f2cfba48d94aa19b7ba206268a83 (patch) | |
| tree | 40dc52126ab5a1570a000321d93ca4bb03312684 /arch/mips/pci/pci-yosemite.c | |
| parent | [DLM] Fix potential conflict in DLM userland locks (diff) | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-d636b2798732f2cfba48d94aa19b7ba206268a83.tar.xz linux-d636b2798732f2cfba48d94aa19b7ba206268a83.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/pci/pci-yosemite.c')
| -rw-r--r-- | arch/mips/pci/pci-yosemite.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/mips/pci/pci-yosemite.c b/arch/mips/pci/pci-yosemite.c index dac9ed4b0ccf..0357946f30e6 100644 --- a/arch/mips/pci/pci-yosemite.c +++ b/arch/mips/pci/pci-yosemite.c @@ -14,7 +14,10 @@ extern struct pci_ops titan_pci_ops; static struct resource py_mem_resource = { - "Titan PCI MEM", 0xe0000000UL, 0xe3ffffffUL, IORESOURCE_MEM + .start = 0xe0000000UL, + .end = 0xe3ffffffUL, + .name = "Titan PCI MEM", + .flags = IORESOURCE_MEM }; /* @@ -26,7 +29,10 @@ static struct resource py_mem_resource = { #define TITAN_IO_BASE 0xe8000000UL static struct resource py_io_resource = { - "Titan IO MEM", 0x00001000UL, TITAN_IO_SIZE - 1, IORESOURCE_IO, + .start = 0x00001000UL, + .end = TITAN_IO_SIZE - 1, + .name = "Titan IO MEM", + .flags = IORESOURCE_IO, }; static struct pci_controller py_controller = { |