From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751442AbcFFJmA (ORCPT ); Mon, 6 Jun 2016 05:42:00 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:36169 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbcFFJl6 (ORCPT ); Mon, 6 Jun 2016 05:41:58 -0400 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com u569e1aI006920 X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-serial@vger.kernel.org Cc: Arnd Bergmann , Peter Hurley , Rob Herring , Paul Burton , Greg Kroah-Hartman , Matthias Brugger , Masahiro Yamada , Jiri Slaby , Paul Gortmaker , linux-kernel@vger.kernel.org, Andy Shevchenko , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/4] serial: 8250_mtk: drop !defined(MODULE) conditional Date: Mon, 6 Jun 2016 18:41:02 +0900 Message-Id: <1465206063-1018-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465206063-1018-1-git-send-email-yamada.masahiro@socionext.com> References: <1465206063-1018-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The !defined(MODULE) conditional has been added to the OF_EARLYCON_DECLARE() define. This commit partially reverts commit 3f5921a60f74 ("serial: 8250/mediatek: fix building with SERIAL_8250=m"). Signed-off-by: Masahiro Yamada --- drivers/tty/serial/8250/8250_mtk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c index 3489fbc..3611ec9 100644 --- a/drivers/tty/serial/8250/8250_mtk.c +++ b/drivers/tty/serial/8250/8250_mtk.c @@ -301,7 +301,7 @@ static struct platform_driver mtk8250_platform_driver = { }; module_platform_driver(mtk8250_platform_driver); -#if defined(CONFIG_SERIAL_8250_CONSOLE) && !defined(MODULE) +#ifdef CONFIG_SERIAL_8250_CONSOLE static int __init early_mtk8250_setup(struct earlycon_device *device, const char *options) { -- 1.9.1