diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 09:25:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 09:25:37 -0800 |
| commit | eaa5eec739637f32f8733d528ff0b94fd62b1214 (patch) | |
| tree | c9568668b920ad677b9a82be02e83b173d20c7d5 /drivers/edac/amd64_edac.h | |
| parent | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | amd64_edac: Simplify ECC override handling (diff) | |
| download | linux-dev-eaa5eec739637f32f8733d528ff0b94fd62b1214.tar.xz linux-dev-eaa5eec739637f32f8733d528ff0b94fd62b1214.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Simplify ECC override handling
Diffstat (limited to 'drivers/edac/amd64_edac.h')
| -rw-r--r-- | drivers/edac/amd64_edac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h index 41bc561e5981..0d4bf5638243 100644 --- a/drivers/edac/amd64_edac.h +++ b/drivers/edac/amd64_edac.h @@ -487,7 +487,8 @@ struct amd64_pvt { /* misc settings */ struct flags { unsigned long cf8_extcfg:1; - unsigned long ecc_report:1; + unsigned long nb_mce_enable:1; + unsigned long nb_ecc_prev:1; } flags; }; |