diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 14:00:56 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 14:00:56 +1100 |
| commit | a9348d4458d2f6ff505b1e0e4044aab8d5f5605e (patch) | |
| tree | 37cb784438d99b6cbed630ff22ebd7003d910e31 /include | |
| parent | 7b1e71990fe332d9ad9ce60ab15aa9a2fa9c3e91 (diff) | |
| parent | 321d17c19bf51a5e0ea19163f7091563c70415a6 (diff) | |
Merge remote-tracking branch 'edac-amd/for-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/edac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/edac.h b/include/linux/edac.h index 07c52c0af62d..5b6adf964248 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -190,8 +190,8 @@ static inline char *mc_event_error_type(const unsigned int err_type) * part of the memory details to the memory controller. * @MEM_RMBS: Rambus DRAM, used on a few Pentium III/IV controllers. * @MEM_DDR2: DDR2 RAM, as described at JEDEC JESD79-2F. - * Those memories are labed as "PC2-" instead of "PC" to - * differenciate from DDR. + * Those memories are labeled as "PC2-" instead of "PC" to + * differentiate from DDR. * @MEM_FB_DDR2: Fully-Buffered DDR2, as described at JEDEC Std No. 205 * and JESD206. * Those memories are accessed per DIMM slot, and not by |