[linux] 01/01: [mips*/octeon] Enable EDAC, EDAC_MM_EDAC, EDAC_OCTEON_L2C, EDAC_OCTEON_LMC, EDAC_OCTEON_PC, EDAC_OCTEON_PCI.

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch master
in repository linux.

commit 8b32b01e4af6614332f463b6ddcfab675ea0720e
Author: Aurelien Jarno <aurelien at aurel32.net>
Date:   Fri May 6 01:30:49 2016 +0200

    [mips*/octeon] Enable EDAC, EDAC_MM_EDAC, EDAC_OCTEON_L2C, EDAC_OCTEON_LMC, EDAC_OCTEON_PC, EDAC_OCTEON_PCI.
---
 debian/changelog                            |  4 ++++
 debian/config/kernelarch-mips/config.octeon | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 143b9e1..4c7122e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ linux (4.6~rc6-1~exp1) UNRELEASED; urgency=medium
   * [hppa] Enable MLONGCALLS (fixes FTBFS)
   * [alpha] fs: Disable BINFMT_EM86 (obsoleted by binfmt_misc; fixes FTBFS)
 
+  [ Aurelien Jarno ]
+  * [mips*/octeon] Enable EDAC, EDAC_MM_EDAC, EDAC_OCTEON_L2C,
+    EDAC_OCTEON_LMC, EDAC_OCTEON_PC, EDAC_OCTEON_PCI.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 05 May 2016 10:54:38 +0100
 
 linux (4.6~rc5-1~exp1) experimental; urgency=medium
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index 588346d..29094f0 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -51,6 +51,16 @@ CONFIG_PATA_OCTEON_CF=y
 CONFIG_HW_RANDOM_OCTEON=m
 
 ##
+## file: drivers/edac/Kconfig
+##
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_OCTEON_L2C=m
+CONFIG_EDAC_OCTEON_LMC=m
+CONFIG_EDAC_OCTEON_PC=m
+CONFIG_EDAC_OCTEON_PCI=m
+
+##
 ## file: drivers/i2c/Kconfig
 ##
 CONFIG_I2C=y

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git