diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
| commit | 766d02786ecd22932beeb9ca8bad6d8c5a552ef9 (patch) | |
| tree | f6f2df0e35bbea914d1f4d12be6d02f128c73575 /drivers/edac | |
| parent | 906d882cacecd37ad2fdd03ed2a9b232bcb9507e (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'drivers/edac')
| -rw-r--r-- | drivers/edac/mpc85xx_edac.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 065732ddf40c..d49361bfe670 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/of_platform.h> | 21 | #include <linux/of_platform.h> |
| 22 | #include <linux/of_device.h> | 22 | #include <linux/of_device.h> |
| 23 | #include <asm/mpc85xx.h> | ||
| 24 | #include "edac_module.h" | 23 | #include "edac_module.h" |
| 25 | #include "edac_core.h" | 24 | #include "edac_core.h" |
| 26 | #include "mpc85xx_edac.h" | 25 | #include "mpc85xx_edac.h" |
| @@ -43,8 +42,6 @@ static u32 orig_pci_err_en; | |||
| 43 | static u32 orig_l2_err_disable; | 42 | static u32 orig_l2_err_disable; |
| 44 | static u32 orig_hid1; | 43 | static u32 orig_hid1; |
| 45 | 44 | ||
| 46 | static const char *mpc85xx_ctl_name = "MPC85xx"; | ||
| 47 | |||
| 48 | /************************ MC SYSFS parts ***********************************/ | 45 | /************************ MC SYSFS parts ***********************************/ |
| 49 | 46 | ||
| 50 | static ssize_t mpc85xx_mc_inject_data_hi_show(struct mem_ctl_info *mci, | 47 | static ssize_t mpc85xx_mc_inject_data_hi_show(struct mem_ctl_info *mci, |