Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 262734
b: refs/heads/master
c: a9f729f
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Aug 11, 2011
1 parent 4d2a631 commit 778d6fd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 54a33b190aa5386dd214b4ad02986445e20e83d1
refs/heads/master: a9f729f0e28bb4e4ab0d9e9e3c1675fe4b910f47
5 changes: 3 additions & 2 deletions trunk/drivers/edac/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ config EDAC_DEBUG

config EDAC_DECODE_MCE
tristate "Decode MCEs in human-readable form (only on AMD for now)"
depends on CPU_SUP_AMD && X86_MCE_AMD
depends on CPU_SUP_AMD && X86_MCE
default y
---help---
Enable this option if you want to decode Machine Check Exceptions
Expand Down Expand Up @@ -173,7 +173,8 @@ config EDAC_I5400

config EDAC_I7CORE
tristate "Intel i7 Core (Nehalem) processors"
depends on EDAC_MM_EDAC && PCI && X86 && X86_MCE_INTEL
depends on EDAC_MM_EDAC && PCI && X86
select EDAC_MCE
help
Support for error detection and correction the Intel
i7 Core (Nehalem) Integrated Memory Controller that exists on
Expand Down

0 comments on commit 778d6fd

Please sign in to comment.