From patchwork Mon Nov 16 04:27:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 7620781 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8096CBF90C for ; Mon, 16 Nov 2015 04:29:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78A69204AD for ; Mon, 16 Nov 2015 04:29:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E229204D1 for ; Mon, 16 Nov 2015 04:29:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752654AbbKPE3j (ORCPT ); Sun, 15 Nov 2015 23:29:39 -0500 Received: from mail2.asahi-net.or.jp ([202.224.39.198]:17983 "EHLO mail2.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752597AbbKPE3j (ORCPT ); Sun, 15 Nov 2015 23:29:39 -0500 Received: from sa76r4 (y081184.ppp.asahi-net.or.jp [118.243.81.184]) by mail2.asahi-net.or.jp (Postfix) with ESMTP id EFCB26269; Mon, 16 Nov 2015 13:29:37 +0900 (JST) Received: from localhost (localhost [127.0.0.1]) by sa76r4 (Postfix) with ESMTP id B54C11068D; Mon, 16 Nov 2015 13:28:03 +0900 (JST) X-Virus-Scanned: Debian amavisd-new at sa76r4.localdomain Received: from sa76r4 ([127.0.0.1]) by localhost (sa76r4.localdomain [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yxtqpyf7_NOz; Mon, 16 Nov 2015 13:28:03 +0900 (JST) Received: by sa76r4 (Postfix, from userid 1000) id 9BE481C0C; Mon, 16 Nov 2015 13:28:03 +0900 (JST) From: Yoshinori Sato To: Ulrich Hecht Cc: Yoshinori Sato , linux-sh@vger.kernel.org Subject: [PATCH] sh: sh-sci build failure fix. Date: Mon, 16 Nov 2015 13:27:46 +0900 Message-Id: <1447648066-1761-1-git-send-email-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1447431743-16376-2-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1447431743-16376-2-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We need little update. Build failed on CONFIG_SERIAL_EARLYCON=y and CONFIG_SERIAL_SH_SCI=m. I think it only COMPILE_TEST. earlycon code depend on CONFIG_SERIAL_SH_SCI_EARLYCON Signed-off-by: Yoshinori Sato --- drivers/tty/serial/sh-sci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 39e5358..9078443 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2412,7 +2412,7 @@ static void sci_cleanup_single(struct sci_port *port) pm_runtime_disable(port->port.dev); } -#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || defined(CONFIG_SERIAL_EARLYCON) +#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || defined(CONFIG_SERIAL_SH_SCI_EARLYCON) static void serial_console_putchar(struct uart_port *port, int ch) { sci_poll_put_char(port, ch); @@ -2793,7 +2793,7 @@ static void __exit sci_exit(void) early_platform_init_buffer("earlyprintk", &sci_driver, early_serial_buf, ARRAY_SIZE(early_serial_buf)); #endif -#ifdef CONFIG_SERIAL_EARLYCON +#ifdef CONFIG_SERIAL_SH_SCI_EARLYCON static struct __init plat_sci_port port_cfg; static int __init early_console_setup(struct earlycon_device *device,