From 31a0de9ae69c9baec9733ac03ca06f2c03c1603a Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 28 Jan 2010 18:15:05 +0900 Subject: [PATCH] --- yaml --- r: 181149 b: refs/heads/master c: 849593591ce3b5f9352966c9d410284dc04d03b6 h: refs/heads/master i: 181147: 959d36940efaf8555a72efc13acac00a168ed31a v: v3 --- [refs] | 2 +- trunk/arch/sh/drivers/pci/pci.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dae69e63942d..0947e8125c8f 100644 --- 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 index c481df639022..191075e91cda 100644 --- 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;