From 1d6814a635206208c0c97406d01e0fafd1b8082c Mon Sep 17 00:00:00 2001 From: Will Schmidt Date: Tue, 30 May 2006 13:38:40 -0500 Subject: [PATCH] --- yaml --- r: 28733 b: refs/heads/master c: 03ac829b0046d5769eef3dd841cec33a211db96e h: refs/heads/master i: 28731: fbf6955221cddb32675e78f589f9c2ebb2820146 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_parse.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 786c43da896f..a4ea498b19bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5cf0e30bf3d8cb56758abb612827647c0a821cf +refs/heads/master: 03ac829b0046d5769eef3dd841cec33a211db96e diff --git a/trunk/arch/powerpc/kernel/prom_parse.c b/trunk/arch/powerpc/kernel/prom_parse.c index 23bb060330ef..45df420383cc 100644 --- a/trunk/arch/powerpc/kernel/prom_parse.c +++ b/trunk/arch/powerpc/kernel/prom_parse.c @@ -561,6 +561,9 @@ void of_parse_dma_window(struct device_node *dn, unsigned char *dma_window_prop, *busno = *(dma_window++); prop = get_property(dn, "ibm,#dma-address-cells", NULL); + if (!prop) + prop = get_property(dn, "#address-cells", NULL); + cells = prop ? *(u32 *)prop : prom_n_addr_cells(dn); *phys = of_read_addr(dma_window, cells);