summaryrefslogtreecommitdiff
path: root/arch/powerpc/configs/ppc6xx_defconfig
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/ppc6xx_defconfig
parentbe1d162948f5bb0ced260e60208e7dc06cd45cab (diff)
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/ppc6xx_defconfig')
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 1d2d69dd6409..18d0d60dadbf 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -988,8 +988,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC=m
CONFIG_RTC_CLASS=y
# CONFIG_RTC_HCTOSYS is not set
CONFIG_RTC_DRV_DS1307=m