Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83815
b: refs/heads/master
c: 1d5f726
h: refs/heads/master
i:
  83813: 0cf6464
  83811: 86ae994
  83807: bd508a1
v: v3
  • Loading branch information
Benjamin Herrenschmidt authored and Linus Torvalds committed Feb 7, 2008
1 parent da7e853 commit c835266
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c2ae24cfd1969a28e76641807026a3bbc11c5f31
refs/heads/master: 1d5f726cbf1b736338bbcd83ebc6ad758079261f
2 changes: 2 additions & 0 deletions trunk/drivers/edac/edac_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ enum mem_type {
MEM_DDR2, /* DDR2 RAM */
MEM_FB_DDR2, /* fully buffered DDR2 */
MEM_RDDR2, /* Registered DDR2 RAM */
MEM_XDR, /* Rambus XDR */
};

#define MEM_FLAG_EMPTY BIT(MEM_EMPTY)
Expand All @@ -152,6 +153,7 @@ enum mem_type {
#define MEM_FLAG_DDR2 BIT(MEM_DDR2)
#define MEM_FLAG_FB_DDR2 BIT(MEM_FB_DDR2)
#define MEM_FLAG_RDDR2 BIT(MEM_RDDR2)
#define MEM_FLAG_XDR BIT(MEM_XDR)

/* chipset Error Detection and Correction capabilities and mode */
enum edac_type {
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/edac/edac_mc_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ static const char *mem_types[] = {
[MEM_RMBS] = "RMBS",
[MEM_DDR2] = "Unbuffered-DDR2",
[MEM_FB_DDR2] = "FullyBuffered-DDR2",
[MEM_RDDR2] = "Registered-DDR2"
[MEM_RDDR2] = "Registered-DDR2",
[MEM_XDR] = "XDR"
};

static const char *dev_types[] = {
Expand Down

0 comments on commit c835266

Please sign in to comment.