git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
sys_nautilus.c
diff --git
a/arch/alpha/kernel/sys_nautilus.c
b/arch/alpha/kernel/sys_nautilus.c
index
93744ba
..
e7594a7
100644
(file)
--- a/
arch/alpha/kernel/sys_nautilus.c
+++ b/
arch/alpha/kernel/sys_nautilus.c
@@
-200,7
+200,7
@@
nautilus_init_pci(void)
bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);
hose->bus = bus;
- irongate = pci_
fi
nd_slot(0, 0);
+ irongate = pci_
get_bus_a
nd_slot(0, 0);
bus->self = irongate;
bus->resource[1] = &irongate_mem;