From patchwork Fri Sep 7 15:34:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1423521 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7E507DF283 for ; Fri, 7 Sep 2012 15:39:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751011Ab2IGPiw (ORCPT ); Fri, 7 Sep 2012 11:38:52 -0400 Received: from na3sys009aog121.obsmtp.com ([74.125.149.145]:39508 "EHLO na3sys009aog121.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750753Ab2IGPiv (ORCPT ); Fri, 7 Sep 2012 11:38:51 -0400 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]) (using TLSv1) by na3sys009aob121.postini.com ([74.125.148.12]) with SMTP ID DSNKUEoVCko9ws6bhgRKhVftSeI3h/SHLPUU@postini.com; Fri, 07 Sep 2012 08:38:51 PDT Received: by lagy9 with SMTP id y9so1930194lag.19 for ; Fri, 07 Sep 2012 08:38:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=PrAgAcwAuO/ORaEotyH4mEfw0Ss51GS9W1j4aevui8g=; b=B1doU6rtvqZhU1h4x4sdBe6r1L1piiIxMmS6Icc5seu3r607aIT2Otk0oZyqb2DAwL LP6F7Td57/L0Ubt5sNEQ+Q0hYBgxw6/wBAn68WBwUs95pB50URFahK6zBEUbibSj5BSt cryg7hxEE9+2J+NF13G70x2xds72sbUJWIooc2jots1zjhfkYcMNanfqUVu6zkun0bIN CS4RilyKqU51qJqCMeSGS1CsKHZ5YqA2xWQT3VjJdk9+NjUx37S2Zq0u5yYCPkETm+fY rDTTIHDhWwnWkqDPcKox6LpT55Xydka6QFpp4whRyhQtd1ttcyZ+XmV4EjhzoHADSPBC NUnw== Received: by 10.152.132.168 with SMTP id ov8mr5785613lab.0.1347032328911; Fri, 07 Sep 2012 08:38:48 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id xx8sm5491693lab.10.2012.09.07.08.38.46 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Sep 2012 08:38:47 -0700 (PDT) From: Felipe Balbi To: Greg KH Cc: alan@linux.intel.com, Tony Lindgren , Kevin Hilman , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , linux-serial@vger.kernel.org, Linux Kernel Mailing List , Santosh Shilimkar , Shubhrajyoti Datta , Sourav Poddar , Felipe Balbi Subject: [PATCH] serial: omap: fix compile breakage Date: Fri, 7 Sep 2012 18:34:19 +0300 Message-Id: <1347032059-8901-1-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <20120907153136.GA8634@kroah.com> References: <20120907153136.GA8634@kroah.com> X-Gm-Message-State: ALoCoQkrnA8Hf7TEo9Id07iOGvQxBmXKOvJunDld9ChLy7uuNeQjVujFFcj6I5TB+nvMx/jsmQfB Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org when rebasing patches on top of Greg's tty-next, it looks like automerge broke a few things which I didn't catch (for whatever reason I didn't have OMAP Serial enabled on .config) so I ended up breaking the build on Greg's tty-next branch. Fix the breakage by re-adding the three missing members on struct uart_omap_port. Reported-by: Tony Lindgren Signed-off-by: Felipe Balbi --- Hi Greg, I just fetched your tree again and rebased again just to make sure. Everything is fine here, let me know if it still applies with fuzz. cheers arch/arm/plat-omap/include/plat/omap-serial.h | 4 ---- drivers/tty/serial/omap-serial.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index 3c9fd3e..a531149 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h @@ -105,8 +105,4 @@ struct uart_omap_dma { unsigned int rx_timeout; }; - - int DTR_gpio; - int DTR_inverted; - int DTR_active; #endif /* __OMAP_SERIAL_H__ */ diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index cfd2094..0a6e78e 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -100,6 +100,10 @@ struct uart_omap_port { u8 wakeups_enabled; unsigned int irq_pending:1; + int DTR_gpio; + int DTR_inverted; + int DTR_active; + struct pm_qos_request pm_qos_request; u32 latency; u32 calc_latency;