git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
mips
/
pci
/
pci.c
diff --git
a/arch/mips/pci/pci.c
b/arch/mips/pci/pci.c
index
54853e7
..
9bee1e9
100644
(file)
--- a/
arch/mips/pci/pci.c
+++ b/
arch/mips/pci/pci.c
@@
-4,7
+4,7
@@
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
- * Copyright (C) 2003
, 04
Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 2003 Ralf Baechle (ralf@linux-mips.org)
*/
#include <linux/config.h>
#include <linux/kernel.h>
*/
#include <linux/config.h>
#include <linux/kernel.h>
@@
-14,6
+14,8
@@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/types.h>
#include <linux/pci.h>
+#include <asm/pci_channel.h>
+
/*
* Indicate whether we respect the PCI setup left by the firmware.
*
/*
* Indicate whether we respect the PCI setup left by the firmware.
*
@@
-221,7
+223,7
@@
int pcibios_enable_device(struct pci_dev *dev, int mask)
if ((err = pcibios_enable_resources(dev, mask)) < 0)
return err;
if ((err = pcibios_enable_resources(dev, mask)) < 0)
return err;
- return
pcibios_plat_dev_init(dev)
;
+ return
0
;
}
static void __init pcibios_fixup_device_resources(struct pci_dev *dev,
}
static void __init pcibios_fixup_device_resources(struct pci_dev *dev,