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: 1423531 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 517A63FC85 for ; Fri, 7 Sep 2012 15:41:45 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TA0e1-0007vm-2U; Fri, 07 Sep 2012 15:38:57 +0000 Received: from na3sys009aog115.obsmtp.com ([74.125.149.238]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1TA0dx-0007v1-2f for linux-arm-kernel@lists.infradead.org; Fri, 07 Sep 2012 15:38:54 +0000 Received: from mail-lb0-f177.google.com ([209.85.217.177]) (using TLSv1) by na3sys009aob115.postini.com ([74.125.148.12]) with SMTP ID DSNKUEoVCko9ws6bhgRKhVftSeI3h/SHLPUU@postini.com; Fri, 07 Sep 2012 08:38:52 PDT Received: by lbbgf7 with SMTP id gf7so1923783lbb.36 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=Uhdpfqh//wR4LMwDt1Yw1SaDWzcKUhe8UqKyxTIBunW0lMdmecaQtoIohqotum6n5z 7KPvr6U25+0ijeYRAKve6R9n8O3/Z0qMxlKiz89aZsGjBTstBBA+M2K70Wghk6+xFRuU McXn9D7uACM41DvJgTofFsvo0AetQVfN2D5obcU1oPAoprcaN0cBL6Bj6aiseDH8lY4l pWPO/VBT1fOL3uNrFdY8CmIFZXvR7Hc4d9RVZGi3ZeHCxWDP3SXsynBRFAYP1f8n2/XO NXkVncrMThwLNvjhd7DiS8WeUzlkA2Jhlt59sVPiUFrnGtN3rhyxmt+3LB9hKdiksg8o D97A== 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 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: ALoCoQmPTk9vstWZh+feuM/7S15PjOxdHJebUWrLy116y0UD10EJzgNYSxx5YbkAQHR3fKV0iiiy X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.238 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kevin Hilman , Tony Lindgren , Linux Kernel Mailing List , Felipe Balbi , Santosh Shilimkar , linux-serial@vger.kernel.org, Sourav Poddar , Linux OMAP Mailing List , Shubhrajyoti Datta , Linux ARM Kernel Mailing List , alan@linux.intel.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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;