Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3c4ff6d authored by Borislav Petkov's avatar Borislav Petkov
Browse files

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: default avatarBorislav 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
parent be1d1629

arch/arm/configs/multi_v7_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -748,7 +748,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 
CONFIG_LEDS_TRIGGER_TRANSIENT=y

CONFIG_LEDS_TRIGGER_CAMERA=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_HIGHBANK_MC=y

CONFIG_EDAC_HIGHBANK_L2=y

CONFIG_RTC_CLASS=y

arch/arm/configs/pxa_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -635,8 +635,7 @@ CONFIG_LEDS_TRIGGER_GPIO=m 
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m

CONFIG_LEDS_TRIGGER_TRANSIENT=m

CONFIG_LEDS_TRIGGER_CAMERA=m

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=m

CONFIG_EDAC=m

CONFIG_RTC_CLASS=y

CONFIG_RTC_DEBUG=y

CONFIG_RTC_DRV_DS1307=m

arch/powerpc/configs/85xx-hw.config

+1 −2
Original line number Diff line number Diff line
@@ -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

arch/powerpc/configs/85xx/ge_imp3a_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 
CONFIG_USB_OHCI_HCD_PPC_OF_LE=y

CONFIG_USB_STORAGE=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_MPC85XX=y

CONFIG_RTC_CLASS=y

# CONFIG_RTC_INTF_PROC is not set

arch/powerpc/configs/85xx/xes_mpc85xx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ CONFIG_LEDS_TRIGGERS=y 
CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_CMOS=y