diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/parisc/kernel/pci.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/parisc/kernel/pci.c')
| -rw-r--r-- | arch/parisc/kernel/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c index e6a891a0cad0..88cba49c5301 100644 --- a/arch/parisc/kernel/pci.c +++ b/arch/parisc/kernel/pci.c | |||
| @@ -202,7 +202,8 @@ static void | |||
| 202 | pcibios_link_hba_resources( struct resource *hba_res, struct resource *r) | 202 | pcibios_link_hba_resources( struct resource *hba_res, struct resource *r) |
| 203 | { | 203 | { |
| 204 | if (!r->parent) { | 204 | if (!r->parent) { |
| 205 | printk(KERN_EMERG "PCI: Tell willy he's wrong\n"); | 205 | printk(KERN_EMERG "PCI: resource not parented! [%lx-%lx]\n", |
| 206 | r->start, r->end); | ||
| 206 | r->parent = hba_res; | 207 | r->parent = hba_res; |
| 207 | 208 | ||
| 208 | /* reverse link is harder *sigh* */ | 209 | /* reverse link is harder *sigh* */ |