From patchwork Mon Jun 6 09:41:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 69399 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1392361qgf; Mon, 6 Jun 2016 02:42:14 -0700 (PDT) X-Received: by 10.36.73.3 with SMTP id z3mr14971356ita.68.1465206134369; Mon, 06 Jun 2016 02:42:14 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o124si27505156pfb.247.2016.06.06.02.42.13; Mon, 06 Jun 2016 02:42:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752047AbcFFJmA (ORCPT + 31 others); 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 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id u569e1aI006920; Mon, 6 Jun 2016 18:40:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com u569e1aI006920 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1465206008; bh=E+IZ1NlSL601eXg7yZR6zcmxa02OzGugHdvBt9m6+R0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WKg1XTbUCDHpBldvvbBEuMjsf5zu3Z3vMyRrdV7YiN2sq0I/iic8SOsez6Qlr8uEY aIml3Yebfo4txPQwHPKGufWpQurPs7Wdyc0hMVEZU9VqTgA3wyLPj0sIK5nE8ctvlh WGf0oqhSqOqQErU9HufLtgnSFB5dk/teeAaxwoUxyXolvkRYWRUQdinISF9RMtl+dT CpsZGPVksT7NJqXHoZsLoEyP+oU31ksjmi3beZrpFSaB6gSoS4MuQtXa8a1jf/chxb aueokviyrBtTX5k5+EfeH+Oao6gQXgO3C9MDHuvxu++hKMnH1nBXof/8dZOKm0WqVp tUYFSrLW78aOQ== 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 Precedence: bulk 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(-) -- 1.9.1 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) {