diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 10:27:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 10:27:55 -0700 |
commit | d2c5f06e361f18be0d7b75988ce6a9e8800a8113 (patch) | |
tree | 3e49fffc05e1d7aa1413ffcdc1dcb41521fd0875 /arch/sparc64/kernel/pci_sabre.c | |
parent | c1448791648d44ecbf8cadb192704e3e6eb3bb0e (diff) | |
parent | 6cf431d77c3e917399a847e3a7ec239d5163056b (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Clean up asm-sparc/elf.h pollution in userspace.
[SPARC64]: Fix of_ioremap().
[SPARC64]: Compute dma_end argument to sabre_pbm_init() correctly.
Diffstat (limited to 'arch/sparc64/kernel/pci_sabre.c')
-rw-r--r-- | arch/sparc64/kernel/pci_sabre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c index de7f7850a84..94bb681f232 100644 --- a/arch/sparc64/kernel/pci_sabre.c +++ b/arch/sparc64/kernel/pci_sabre.c @@ -1465,5 +1465,5 @@ void sabre_init(struct device_node *dp, char *model_name) /* * Look for APB underneath. */ - sabre_pbm_init(p, dp, vdma[0], vdma[1]); + sabre_pbm_init(p, dp, vdma[0], vdma[0] + vdma[1]); } |