From: David S. Miller <davem@davemloft.net>
Date: Mon, 8 Sep 2008 22:39:30 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.28-rc1~706^2~53
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=98d86c091534f35c4bab294451ae6bccab8e9075;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Conflicts:

	arch/sparc/kernel/of_device.c
---

98d86c091534f35c4bab294451ae6bccab8e9075
diff --cc arch/sparc/kernel/of_device.c
index 4ef16075588,c481d45f97b..c88af7efc33
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@@ -409,8 -371,12 +415,9 @@@ static void __init build_device_resourc
  
  		memcpy(addr, reg, na * 4);
  
+ 		flags = bus->get_flags(reg, 0);
+ 
 -		/* If the immediate parent has no ranges property to apply,
 -		 * just use a 1<->1 mapping.
 -		 */
 -		if (of_find_property(pp, "ranges", NULL) == NULL) {
 +		if (use_1to1_mapping(pp)) {
  			result = of_read_addr(addr, na);
  			goto build_res;
  		}