aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/85xx-hw.config
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2017-02-03 18:18:05 +0100
committerBorislav Petkov <bp@suse.de>2017-04-10 17:14:41 +0200
commite3c4ff6d8c949fa9a9ea1bd005bf1967efe09d5d (patch)
tree3f9238faa0bb6da4bfc0787b52e9ecadf14b361a /arch/powerpc/configs/85xx-hw.config
parentEDAC: Issue tracepoint only when it is defined (diff)
downloadlinux-dev-e3c4ff6d8c949fa9a9ea1bd005bf1967efe09d5d.tar.xz
linux-dev-e3c4ff6d8c949fa9a9ea1bd005bf1967efe09d5d.zip
EDAC: Remove EDAC_MM_EDAC
Move all the EDAC core functionality behind CONFIG_EDAC and get rid of that indirection. Update defconfigs which had it. While at it, fix dependencies such that EDAC depends on RAS for the tracepoints. Signed-off-by: Borislav Petkov <bp@suse.de> Cc: linux-arm-kernel@lists.infradead.org Cc: linuxppc-dev@lists.ozlabs.org Cc: Chris Metcalf <cmetcalf@mellanox.com> Cc: linux-edac@vger.kernel.org
Diffstat (limited to 'arch/powerpc/configs/85xx-hw.config')
-rw-r--r--arch/powerpc/configs/85xx-hw.config3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/85xx-hw.config b/arch/powerpc/configs/85xx-hw.config
index 528ff0e714e6..c03d0fb16665 100644
--- a/arch/powerpc/configs/85xx-hw.config
+++ b/arch/powerpc/configs/85xx-hw.config
@@ -16,9 +16,8 @@ CONFIG_DAVICOM_PHY=y
CONFIG_DMADEVICES=y
CONFIG_E1000E=y
CONFIG_E1000=y
-CONFIG_EDAC_MM_EDAC=y
-CONFIG_EDAC_MPC85XX=y
CONFIG_EDAC=y
+CONFIG_EDAC_MPC85XX=y
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_LEGACY=y
CONFIG_FB_FSL_DIU=y