This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / mips / au1000 / common / pci.c

diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c
index 7e187a0..d5ccbd2 100644 (file)
--- a/arch/mips/au1000/common/pci.c
+++ b/arch/mips/au1000/common/pci.c
@@ -6,8 +6,6 @@
  * Author: MontaVista Software, Inc.
  *             ppopov@mvista.com or source@mvista.com
  *
- * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
- *
  *  Support for all devices (greater than 16) added by David Gathright.
  *
  *  This program is free software; you can redistribute  it and/or modify it
@@ -37,6 +35,7 @@
 #include <linux/init.h>
 
 #include <asm/mach-au1x00/au1000.h>
+#include <asm/pci_channel.h>
 
 /* TBD */
 static struct resource pci_io_resource = {
@@ -68,12 +67,15 @@ static unsigned long virt_io_addr;
 static int __init au1x_pci_setup(void)
 {
 #if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550)
+       int i;
+       struct pci_dev *dev;
+       
        virt_io_addr = (unsigned long)ioremap(Au1500_PCI_IO_START, 
                        Au1500_PCI_IO_END - Au1500_PCI_IO_START + 1);
 
        if (!virt_io_addr) {
                printk(KERN_ERR "Unable to ioremap pci space\n");
-               return 1;
+               return;
        }
 
 #ifdef CONFIG_DMA_NONCOHERENT