This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / syslib / indirect_pci.c

diff --git a/arch/ppc/syslib/indirect_pci.c b/arch/ppc/syslib/indirect_pci.c
index 1cc4f96..4bc90eb 100644 (file)
--- a/arch/ppc/syslib/indirect_pci.c
+++ b/arch/ppc/syslib/indirect_pci.c
@@ -111,15 +111,6 @@ static struct pci_ops indirect_pci_ops =
        indirect_write_config
 };
 
-void __init
-setup_indirect_pci_nomap(struct pci_controller* hose, u32 cfg_addr,
-       u32 cfg_data)
-{
-       hose->cfg_addr = (unsigned int *)cfg_addr;
-       hose->cfg_data = (unsigned char *)cfg_data;
-       hose->ops = &indirect_pci_ops;
-}
-
 void __init
 setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)
 {
@@ -127,9 +118,9 @@ setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)
        char *mbase;
 
        mbase = ioremap(base, PAGE_SIZE);
-       cfg_addr = (u32)(mbase + (cfg_addr & ~PAGE_MASK));
+       hose->cfg_addr = (unsigned int *)(mbase + (cfg_addr & ~PAGE_MASK));
        if ((cfg_data & PAGE_MASK) != base)
                mbase = ioremap(cfg_data & PAGE_MASK, PAGE_SIZE);
-       cfg_data = (u32)(mbase + (cfg_data & ~PAGE_MASK));
-       setup_indirect_pci_nomap(hose, cfg_addr, cfg_data);
+       hose->cfg_data = (unsigned char *)(mbase + (cfg_data & ~PAGE_MASK));
+       hose->ops = &indirect_pci_ops;
 }