diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 10:38:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 10:38:02 -0700 |
| commit | 3aed77bc84013fced136977b7cc17fff60eddf7a (patch) | |
| tree | 75ee4060f58f033deb16771a303fb55dd370b6f9 /drivers/video/offb.c | |
| parent | 0b968d23610d65a46299347b141a687e207bd294 (diff) | |
| parent | b2ad7b5e8115582cdf5bbda065aa516c24d62c21 (diff) | |
| download | kernel_samsung_smdk4412-3aed77bc84013fced136977b7cc17fff60eddf7a.zip kernel_samsung_smdk4412-3aed77bc84013fced136977b7cc17fff60eddf7a.tar.gz kernel_samsung_smdk4412-3aed77bc84013fced136977b7cc17fff60eddf7a.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'drivers/video/offb.c')
| -rw-r--r-- | drivers/video/offb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/offb.c b/drivers/video/offb.c index 42a6591..611922c 100644 --- a/drivers/video/offb.c +++ b/drivers/video/offb.c @@ -363,7 +363,7 @@ static void __init offb_init_nodriver(struct device_node *dp) address = (u_long) dp->addrs[i].address; #ifdef CONFIG_PPC64 - address += dp->phb->pci_mem_offset; + address += ((struct pci_dn *)dp->data)->phb->pci_mem_offset; #endif /* kludge for valkyrie */ |