Add changes from the Linux-2.6 tree.

[linux-2.6.git] / arch / mips / pci / fixup-jaguar.c

diff --git a/arch/mips/pci/fixup-jaguar.c b/arch/mips/pci/fixup-jaguar.c
index fa78b9b..6c5e1d4 100644 (file)
--- a/arch/mips/pci/fixup-jaguar.c
+++ b/arch/mips/pci/fixup-jaguar.c
@@ -8,14 +8,13 @@
  * Marvell wants an NDA for their docs so this was written without
  * documentation.  You've been warned.
  *
- * Copyright (C) 2004 Ralf Baechle
+ * Copyright (C) 2004 Ralf Baechle (ralf@linux-mips.org)
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 
 #include <asm/mipsregs.h>
-#include <asm/pci_channel.h>
 
 /*
  * WARNING: Example of how _NOT_ to do it.
@@ -37,6 +36,8 @@ return 0;
        panic("Whooops in pcibios_map_irq");
 }
 
-struct pci_fixup pcibios_fixups[] = {
-       {0}
-};
+/* Do platform specific device initialization at pci_enable_device() time */
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+       return 0;
+}