Commit 442d1ba2 authored Jan 07, 2011 by Linus Torvalds

Merge branch 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

* 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: Disable DRAM ECC injection on K8
  EDAC: Fixup scrubrate manipulation
  amd64_edac: Remove two-stage initialization
  amd64_edac: Check ECC capabilities initially
  amd64_edac: Carve out ECC-related hw settings
  amd64_edac: Remove PCI ECS enabling functions
  amd64_edac: Remove explicit Kconfig PCI dependency
  amd64_edac: Allocate driver instances dynamically
  amd64_edac: Rework printk macros
  amd64_edac: Rename CPU PCI devices
  amd64_edac: Concentrate per-family init even more
  amd64_edac: Cleanup the CPU PCI device reservation
  amd64_edac: Simplify CPU family detection
  amd64_edac: Add per-family init function
  amd64_edac: Use cached extended CPU model
  amd64_edac: Remove F11h support

parents fb5131e1 a135cef7

drivers/edac/Kconfig

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -75,11 +75,11 @@ config EDAC_MCE
	bool		bool

	config EDAC_AMD64		config EDAC_AMD64
	tristate "AMD64 (Opteron, Athlon64) K8, F10h, F11h"		tristate "AMD64 (Opteron, Athlon64) K8, F10h"
	depends on EDAC_MM_EDAC && AMD_NB && X86_64 && PCI && EDAC_DECODE_MCE		depends on EDAC_MM_EDAC && AMD_NB && X86_64 && EDAC_DECODE_MCE
	help		help
	Support for error detection and correction on the AMD 64		Support for error detection and correction of DRAM ECC errors on
	Families of Memory Controllers (K8, F10h and F11h)		the AMD64 families of memory controllers (K8 and F10h)

	config EDAC_AMD64_ERROR_INJECTION		config EDAC_AMD64_ERROR_INJECTION
	bool "Sysfs HW Error injection facilities"		bool "Sysfs HW Error injection facilities"