diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 11:33:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 11:33:53 -0400 |
| commit | 26cda988ba1e3e843a0680fe98661a22fa430a60 (patch) | |
| tree | 692e76e9bc9b11ed34bad88f892adc0184c2e5ff /arch/ppc64/kernel/iSeries_pci.c | |
| parent | 1df5c10a5b40d1ad747e3de3caf28764153c5c8e (diff) | |
| parent | 2d909d08db7655a53f3afb31c7627c5c8c87142a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/iSeries_pci.c')
| -rw-r--r-- | arch/ppc64/kernel/iSeries_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c index 356e4fd9a94f..fbc273c32bcc 100644 --- a/arch/ppc64/kernel/iSeries_pci.c +++ b/arch/ppc64/kernel/iSeries_pci.c | |||
| @@ -252,7 +252,7 @@ unsigned long __init find_and_init_phbs(void) | |||
| 252 | phb = (struct pci_controller *)kmalloc(sizeof(struct pci_controller), GFP_KERNEL); | 252 | phb = (struct pci_controller *)kmalloc(sizeof(struct pci_controller), GFP_KERNEL); |
| 253 | if (phb == NULL) | 253 | if (phb == NULL) |
| 254 | return -ENOMEM; | 254 | return -ENOMEM; |
| 255 | pci_setup_pci_controller(phb); | 255 | pci_setup_pci_controller(phb); |
| 256 | 256 | ||
| 257 | phb->pci_mem_offset = phb->local_number = bus; | 257 | phb->pci_mem_offset = phb->local_number = bus; |
| 258 | phb->first_busno = bus; | 258 | phb->first_busno = bus; |