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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
powerpc
/
platforms
/
83xx
/
pci.c
diff --git
a/arch/powerpc/platforms/83xx/pci.c
b/arch/powerpc/platforms/83xx/pci.c
index
16f7d3b
..
5d84a9c
100644
(file)
--- a/
arch/powerpc/platforms/83xx/pci.c
+++ b/
arch/powerpc/platforms/83xx/pci.c
@@
-9,7
+9,6
@@
* option) any later version.
*/
* option) any later version.
*/
-#include <linux/config.h>
#include <linux/stddef.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/stddef.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-46,6
+45,15
@@
int mpc83xx_exclude_device(u_char bus, u_char devfn)
return PCIBIOS_SUCCESSFUL;
}
return PCIBIOS_SUCCESSFUL;
}
+void __init mpc83xx_pcibios_fixup(void)
+{
+ struct pci_dev *dev = NULL;
+
+ /* map all the PCI irqs */
+ for_each_pci_dev(dev)
+ pci_read_irq_line(dev);
+}
+
int __init add_bridge(struct device_node *dev)
{
int len;
int __init add_bridge(struct device_node *dev)
{
int len;
@@
-91,9
+99,10
@@
int __init add_bridge(struct device_node *dev)
mpc83xx_pci2_busno = hose->first_busno;
}
mpc83xx_pci2_busno = hose->first_busno;
}
- printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%0
8
lx. "
+ printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%0
16l
lx. "
"Firmware bus number: %d->%d\n",
"Firmware bus number: %d->%d\n",
- rsrc.start, hose->first_busno, hose->last_busno);
+ (unsigned long long)rsrc.start, hose->first_busno,
+ hose->last_busno);
DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
hose, hose->cfg_addr, hose->cfg_data);
DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
hose, hose->cfg_addr, hose->cfg_data);