diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/edac/amd8111_edac.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/edac/amd8111_edac.c')
| -rw-r--r-- | drivers/edac/amd8111_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/amd8111_edac.c b/drivers/edac/amd8111_edac.c index 35b78d04bbfa..ddd890052ce2 100644 --- a/drivers/edac/amd8111_edac.c +++ b/drivers/edac/amd8111_edac.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #include "edac_module.h" | 33 | #include "edac_module.h" |
| 34 | #include "amd8111_edac.h" | 34 | #include "amd8111_edac.h" |
| 35 | 35 | ||
| 36 | #define AMD8111_EDAC_REVISION " Ver: 1.0.0 " __DATE__ | 36 | #define AMD8111_EDAC_REVISION " Ver: 1.0.0" |
| 37 | #define AMD8111_EDAC_MOD_STR "amd8111_edac" | 37 | #define AMD8111_EDAC_MOD_STR "amd8111_edac" |
| 38 | 38 | ||
| 39 | #define PCI_DEVICE_ID_AMD_8111_PCI 0x7460 | 39 | #define PCI_DEVICE_ID_AMD_8111_PCI 0x7460 |