diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 13:08:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 13:08:46 -0400 |
| commit | 8ed575904373d7aaab7f15a8db2edc317a44df43 (patch) | |
| tree | 3b2e92a396a1bbec8e1fb499f25e8aed93ab5692 /arch/parisc/kernel/pci.c | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
| parent | 210cc679faf0e1cabda9fc5d1279644f5e52aecb (diff) | |
Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6
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* */ |