From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Ahmad Fatoum Date: Mon, 27 Apr 2020 00:28:36 +0200 Message-Id: <20200426222836.12896-1-a.fatoum@pengutronix.de> In-Reply-To: <20200426074752.kmmge3ma3gofzyey@pengutronix.de> References: <20200426074752.kmmge3ma3gofzyey@pengutronix.de> MIME-Version: 1.0 Subject: [DistroKit] [PATCH] fixup! v7a: barebox: add support for Linux Automation MC-1 List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: distrokit-bounces@pengutronix.de Sender: "DistroKit" To: distrokit@pengutronix.de Cc: Ahmad Fatoum We don't use STMFX and kernelconfig changes shouldn't be part of the barebox commit, but made their way in via rebase mistake. fix it up. Signed-off-by: Ahmad Fatoum --- Is the next branch rebased? If not, I can send regular patches instead. --- configs/platform-v7a/kernelconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/platform-v7a/kernelconfig b/configs/platform-v7a/kernelconfig index 5e05c6629dea..805391007ce0 100644 --- a/configs/platform-v7a/kernelconfig +++ b/configs/platform-v7a/kernelconfig @@ -2143,7 +2143,7 @@ CONFIG_TWL6040_CORE=y # CONFIG_MFD_STM32_LPTIMER is not set CONFIG_MFD_STM32_TIMERS=y CONFIG_MFD_STPMIC1=y -CONFIG_MFD_STMFX=y +# CONFIG_MFD_STMFX is not set CONFIG_MFD_VEXPRESS_SYSREG=y # end of Multifunction device drivers -- 2.26.1 _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de