The following commit has been merged in the linux branch: commit 0616fb003d4f799c4be62275242fc7ff9a968f84 Author: Ira W. Snyder iws@ovro.caltech.edu Date: Mon Oct 26 16:50:10 2009 -0700

edac: i5400 fix missing CONFIG_PCI define

When building without CONFIG_PCI the edac_pci_idx variable is unused, causing a build-time warning. Wrap the variable in #ifdef CONFIG_PCI, just like the rest of the PCI support.

Signed-off-by: Ira W. Snyder iws@ovro.caltech.edu Signed-off-by: Doug Thompson dougthompson@xmission.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 157f650..cf27402 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c @@ -26,7 +26,9 @@ #include "mpc85xx_edac.h"

static int edac_dev_idx; +#ifdef CONFIG_PCI static int edac_pci_idx; +#endif static int edac_mc_idx;

static u32 orig_ddr_err_disable;