3 files changed, 12 insertions, 7 deletions

diff --git a/arch/sh/drivers/pci/ops-sh4.c b/arch/sh/drivers/pci/ops-sh4.c
index 92d27f734f2e..ee62e6de7133 100644
--- a/arch/sh/drivers/pci/ops-sh4.c
+++ b/arch/sh/drivers/pci/ops-sh4.c
@@ -26,6 +26,7 @@ static DEFINE_SPINLOCK(sh4_pci_lock);
 static int sh4_pci_read(struct pci_bus *bus, unsigned int devfn,
                            int where, int size, u32 *val)
 {
+        struct pci_channel *chan = bus->sysdata;
         unsigned long flags;
         u32 data;
 
@@ -34,8 +35,8 @@ static int sh4_pci_read(struct pci_bus *bus, unsigned int devfn,
          * so we must do byte alignment by hand
          */
         spin_lock_irqsave(&sh4_pci_lock, flags);
-        pci_write_reg(NULL, CONFIG_CMD(bus, devfn, where), SH4_PCIPAR);
-        data = pci_read_reg(NULL, SH4_PCIPDR);
+        pci_write_reg(chan, CONFIG_CMD(bus, devfn, where), SH4_PCIPAR);
+        data = pci_read_reg(chan, SH4_PCIPDR);
         spin_unlock_irqrestore(&sh4_pci_lock, flags);
 
         switch (size) {
@@ -63,13 +64,14 @@ static int sh4_pci_read(struct pci_bus *bus, unsigned int devfn,
 static int sh4_pci_write(struct pci_bus *bus, unsigned int devfn,
                          int where, int size, u32 val)
 {
+        struct pci_channel *chan = bus->sysdata;
         unsigned long flags;
         int shift;
         u32 data;
 
         spin_lock_irqsave(&sh4_pci_lock, flags);
-        pci_write_reg(NULL, CONFIG_CMD(bus, devfn, where), SH4_PCIPAR);
-        data = pci_read_reg(NULL, SH4_PCIPDR);
+        pci_write_reg(chan, CONFIG_CMD(bus, devfn, where), SH4_PCIPAR);
+        data = pci_read_reg(chan, SH4_PCIPDR);
         spin_unlock_irqrestore(&sh4_pci_lock, flags);
 
         switch (size) {
@@ -90,7 +92,7 @@ static int sh4_pci_write(struct pci_bus *bus, unsigned int devfn,
                 return PCIBIOS_FUNC_NOT_SUPPORTED;
         }
 
-        pci_write_reg(NULL, data, SH4_PCIPDR);
+        pci_write_reg(chan, data, SH4_PCIPDR);
 
         return PCIBIOS_SUCCESSFUL;
 }
diff --git a/arch/sh/drivers/pci/pci-auto.c b/arch/sh/drivers/pci/pci-auto.c
index cf48b12ee58c..1d715ec405b2 100644
--- a/arch/sh/drivers/pci/pci-auto.c
+++ b/arch/sh/drivers/pci/pci-auto.c
@@ -67,6 +67,7 @@ static struct pci_dev *fake_pci_dev(struct pci_channel *hose,
         dev.devfn = devfn;
         bus.number = busnr;
         bus.ops = hose->pci_ops;
+        bus.sysdata = hose;
 
         if(busnr != top_bus)
                 /* Fake a parent bus structure. */
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index 5c7a8f1d2d54..386587e08830 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -31,8 +31,10 @@ struct pci_channel {
  */
 extern struct pci_channel board_pci_channels[];
 
-#define PCIBIOS_MIN_IO          board_pci_channels->io_resource->start
-#define PCIBIOS_MIN_MEM         board_pci_channels->mem_resource->start
+/* ugly as hell, but makes drivers/pci/setup-res.c compile and work */
+#define __PCI_CHAN(bus)         ((struct pci_channel *)bus->sysdata)
+#define PCIBIOS_MIN_IO          __PCI_CHAN(bus)->io_resource->start
+#define PCIBIOS_MIN_MEM         __PCI_CHAN(bus)->mem_resource->start
 
 /*
  * I/O routine helpers