diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
| commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
| tree | c34bcc7e314f49005ad88ac84c908128729c0329 /arch/parisc/kernel/pci.c | |
| parent | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (diff) | |
| parent | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (diff) | |
Merge branch 'upstream'
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* */ |