From 5a32713f997a9c0677b04f09c084e4968acc4203 Mon Sep 17 00:00:00 2001
From: "Ira W. Snyder" <iws@ovro.caltech.edu>
Date: Mon, 26 Oct 2009 16:50:10 -0700
Subject: [PATCH] --- yaml --- r: 167758 b: refs/heads/master c:
 0616fb003d4f799c4be62275242fc7ff9a968f84 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/edac/mpc85xx_edac.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index df2a5c42bac0..0d74ec7fd58e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 156edd4aaa819ec5867ced83c7b8dba9193789ea
+refs/heads/master: 0616fb003d4f799c4be62275242fc7ff9a968f84
diff --git a/trunk/drivers/edac/mpc85xx_edac.c b/trunk/drivers/edac/mpc85xx_edac.c
index 157f6504f25e..cf27402af97b 100644
--- a/trunk/drivers/edac/mpc85xx_edac.c
+++ b/trunk/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;