---

yaml --- r: 181149 b: refs/heads/master c: 8495935 h: refs/heads/master i: 181147: 959d369 v: v3
git-mirror · Jan 28, 2010 · 31a0de9 · 31a0de9
1 parent 809ba5a
commit 31a0de9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 621266bdf4b78fa92f7eabd7688b86f0dbd61d64
+refs/heads/master: 849593591ce3b5f9352966c9d410284dc04d03b6
diff --git a/trunk/arch/sh/drivers/pci/pci.c b/trunk/arch/sh/drivers/pci/pci.c
@@ -162,10 +162,8 @@ void pcibios_align_resource(void *data, struct resource *res,
 		/*
                  * Put everything into 0x00-0xff region modulo 0x400.
 		 */
-		if (start & 0x300) {
+		if (start & 0x300)
 			start = (start + 0x3ff) & ~0x3ff;
-			res->start = start;
-		}
 	} else if (res->flags & IORESOURCE_MEM) {
 		if (start < PCIBIOS_MIN_MEM + chan->mem_resource->start)
 			start = PCIBIOS_MIN_MEM + chan->mem_resource->start;