linux-next: build failure after merge of the final tree (galak tree related)

Hi Kumar,

After merging the final tree, next-20100901 (and later) build (powerpc
ppc6xx_defconfig) failed like this:

arch/powerpc/sysdev/fsl_pci.c:484: error: redefinition of 'fsl_pci_immrbar_base'
arch/powerpc/sysdev/fsl_pci.c:313: note: previous definition of 'fsl_pci_immrbar_base' was here

Caused by commit 7e03a809c8e0eb5121fde8295b6218bd336a3792
("powerpc/fsl-pci: Fix MSI support on 83xx platforms").

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