Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / sh / drivers / pci / fixups-se7751.c

diff --git a/arch/sh/drivers/pci/fixups-se7751.c b/arch/sh/drivers/pci/fixups-se7751.c
index 475fa9f..a4c7d3a 100644 (file)
--- a/arch/sh/drivers/pci/fixups-se7751.c
+++ b/arch/sh/drivers/pci/fixups-se7751.c
@@ -97,12 +97,12 @@ int pci_fixup_pcic(struct pci_channel *chan)
        * meaning all calls go straight through... use BUG_ON to
        * catch erroneous assumption.
        */
-       BUG_ON(chan->mem_resource->start != SH7751_PCI_MEMORY_BASE);
+       BUG_ON(chan->resources[1].start != SH7751_PCI_MEMORY_BASE);
 
-       PCIC_WRITE(SH7751_PCIMBR, chan->mem_resource->start);
+       PCIC_WRITE(SH7751_PCIMBR, chan->resources[1].start);
 
        /* Set IOBR for window containing area specified in pci.h */
-       PCIC_WRITE(SH7751_PCIIOBR, (chan->io_resource->start & SH7751_PCIIOBR_MASK));
+       PCIC_WRITE(SH7751_PCIIOBR, (chan->resources[0].start & SH7751_PCIIOBR_MASK));
 
        /* All done, may as well say so... */
        printk("SH7751 PCI: Finished initialization of the PCI controller\n");