From patchwork Mon Jun 6 09:41:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 69398 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1392251qgf; Mon, 6 Jun 2016 02:41:53 -0700 (PDT) X-Received: by 10.36.107.17 with SMTP id v17mr14169414itc.51.1465206113928; Mon, 06 Jun 2016 02:41:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sq4si25667300pab.243.2016.06.06.02.41.53; Mon, 06 Jun 2016 02:41:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751765AbcFFJlx (ORCPT + 2 others); Mon, 6 Jun 2016 05:41:53 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:35941 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbcFFJlw (ORCPT ); Mon, 6 Jun 2016 05:41:52 -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 u569e1aH006920; Mon, 6 Jun 2016 18:40:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com u569e1aH006920 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1465206007; bh=KiTtyU1guBETmp/E0jZGDWrlWQ7+Dnv3MInbjTheCjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gKjJfDQy7/1k5jU1ikyzJ1qDutXv+/ZaRf8dALEJW9JrCLecws4pftBsknvnEF6LO Dh3VOAXXvZRvtLFEaze3VcLvmc0J7kRTIPadd63kjmKCxi81C5AAURvlPzqRLVNFzr t+HfsLBGmWUB/BQomnEzUiVw79lxS5oVqkUoBuDLuhZhIXIsRA1hv/ALTQyZJTeErs sVNwL1jgv4Fq28ZnED5CvECLfXTlUlkK8sn011cCVieAMRt4H9i4xkFSV54r89RfU2 01KkIxulYK68ELvWZDOr/V2EOK0haivy8lwAP/8HyIinZLmAcG8qGlAUr3dZlDK7YD NT4Q7C6y4IIww== 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 , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/4] serial: 8250_uniphier: drop !defined(MODULE) conditional Date: Mon, 6 Jun 2016 18:41:01 +0900 Message-Id: <1465206063-1018-3-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-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The !defined(MODULE) conditional has been added to the OF_EARLYCON_DECLARE() define. Now we can revert commit a2d3ea2f2399 ("serial: 8250/uniphier: fix modular build"). Signed-off-by: Masahiro Yamada --- drivers/tty/serial/8250/8250_uniphier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c index efd1f9c..b8d9c8c 100644 --- a/drivers/tty/serial/8250/8250_uniphier.c +++ b/drivers/tty/serial/8250/8250_uniphier.c @@ -35,7 +35,7 @@ struct uniphier8250_priv { spinlock_t atomic_write_lock; }; -#if defined(CONFIG_SERIAL_8250_CONSOLE) && !defined(MODULE) +#ifdef CONFIG_SERIAL_8250_CONSOLE static int __init uniphier_early_console_setup(struct earlycon_device *device, const char *options) {