From 5904b13f05ecfd4f85c35372bf0280fec08966a3 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 23 Sep 2006 01:18:41 +0100
Subject: [PATCH] --- yaml --- r: 34347 b: refs/heads/master c:
 cc9bd99e9adfa4f44ea050a63fb41a3f764acf84 h: refs/heads/master i:   34345:
 8ec42b53030377f3dddd6f3139057e47817ada69   34343:
 24524c00e448d7e7dbe5019028f301b941218b27 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/sparc/kernel/ebus.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4ba5a291b705..4836fe3ecb89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a83fbf635992442edf6aa3252e4008d4a08edf12
+refs/heads/master: cc9bd99e9adfa4f44ea050a63fb41a3f764acf84
diff --git a/trunk/arch/sparc/kernel/ebus.c b/trunk/arch/sparc/kernel/ebus.c
index 81c0cbd96ff0..75ac24d229b1 100644
--- a/trunk/arch/sparc/kernel/ebus.c
+++ b/trunk/arch/sparc/kernel/ebus.c
@@ -277,7 +277,7 @@ void __init ebus_init(void)
 	struct pci_dev *pdev;
 	struct pcidev_cookie *cookie;
 	struct device_node *dp;
-	unsigned long addr, *base;
+	struct resource *p;
 	unsigned short pci_command;
 	int len, reg, nreg;
 	int num_ebus = 0;
@@ -321,13 +321,12 @@ void __init ebus_init(void)
 		}
 		nreg = len / sizeof(struct linux_prom_pci_registers);
 
-		base = &ebus->self->resource[0].start;
+		p = &ebus->self->resource[0];
 		for (reg = 0; reg < nreg; reg++) {
 			if (!(regs[reg].which_io & 0x03000000))
 				continue;
 
-			addr = regs[reg].phys_lo;
-			*base++ = addr;
+			(p++)->start = regs[reg].phys_lo;
 		}
 
 		ebus->ofdev.node = dp;