git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[safe/jmp/linux-2.6]
/
drivers
/
edac
/
mpc85xx_edac.c
diff --git
a/drivers/edac/mpc85xx_edac.c
b/drivers/edac/mpc85xx_edac.c
index
157f650
..
cf27402
100644
(file)
--- 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;