diff options
| author | Christoph Egger <siccegge@cs.fau.de> | 2010-08-10 18:03:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 08:59:20 -0700 |
| commit | bd1688dcdf6e986913f3f1ff2df9dc2bfb63db5c (patch) | |
| tree | 5310ad5b2f1745d802334bb5fdcd9a9098bf3fcd /drivers | |
| parent | c52b0b91ba1f4b7ea90e20385c0a6df0ba54aed4 (diff) | |
| download | linux-bd1688dcdf6e986913f3f1ff2df9dc2bfb63db5c.tar.gz linux-bd1688dcdf6e986913f3f1ff2df9dc2bfb63db5c.tar.bz2 linux-bd1688dcdf6e986913f3f1ff2df9dc2bfb63db5c.zip | |
edac: add wissing pieces from MPC85xx -> FSL_SOC_BOOKE
In 5753c082f66eca5be81f6bda85c1718c5eea6ada ("powerpc/85xx: Kconfig
cleanup") menuconfig MPC85xx was replaced by FSL_SOC_BOOKE but some
references insider the code were not adjusted accordingly. This patch
adresses these missing pieces.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/mpc85xx_edac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 1052340e6802..fdbad5527098 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c @@ -43,7 +43,7 @@ static u32 orig_pci_err_en; #endif static u32 orig_l2_err_disable; -#ifdef CONFIG_MPC85xx +#ifdef CONFIG_FSL_SOC_BOOKE static u32 orig_hid1[2]; #endif @@ -1140,7 +1140,7 @@ static struct of_platform_driver mpc85xx_mc_err_driver = { }, }; -#ifdef CONFIG_MPC85xx +#ifdef CONFIG_FSL_SOC_BOOKE static void __init mpc85xx_mc_clear_rfxe(void *data) { orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1); @@ -1179,7 +1179,7 @@ static int __init mpc85xx_mc_init(void) printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n"); #endif -#ifdef CONFIG_MPC85xx +#ifdef CONFIG_FSL_SOC_BOOKE /* * need to clear HID1[RFXE] to disable machine check int * so we can catch it @@ -1193,7 +1193,7 @@ static int __init mpc85xx_mc_init(void) module_init(mpc85xx_mc_init); -#ifdef CONFIG_MPC85xx +#ifdef CONFIG_FSL_SOC_BOOKE static void __exit mpc85xx_mc_restore_hid1(void *data) { mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]); @@ -1202,7 +1202,7 @@ static void __exit mpc85xx_mc_restore_hid1(void *data) static void __exit mpc85xx_mc_exit(void) { -#ifdef CONFIG_MPC85xx +#ifdef CONFIG_FSL_SOC_BOOKE on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0); #endif #ifdef CONFIG_PCI |