Hi Dave,

On Tue, 16 Sep 2008 14:31:37 -0700 (PDT) David Miller [off-list ref] wrote:

I just pushed a merge resolution to this by pulling sparc-2.6
into sparc-next-2.6, moving the PCI config space address
computer into psycho_common.h, and propagating the bug fix
from sparc-2.6 into where the code lives now in psycho_common.c

Thanks for that it will get picked up tomorrow.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/