From patchwork Fri Sep 7 05:25:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1419591 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 E6C873FC33 for ; Fri, 7 Sep 2012 05:32:50 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9r8k-00077i-Vs; Fri, 07 Sep 2012 05:30:03 +0000 Received: from na3sys009aog138.obsmtp.com ([74.125.149.19]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9r8g-00077H-MP for linux-arm-kernel@lists.infradead.org; Fri, 07 Sep 2012 05:30:00 +0000 Received: from mail-lb0-f177.google.com ([209.85.217.177]) (using TLSv1) by na3sys009aob138.postini.com ([74.125.148.12]) with SMTP ID DSNKUEmGVEvkC9Xj3njxXyJYvhJddYGj4Fm1@postini.com; Thu, 06 Sep 2012 22:29:58 PDT Received: by lbbgf7 with SMTP id gf7so1606836lbb.36 for ; Thu, 06 Sep 2012 22:29:55 -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=+x29pSmZYuxKSwFcL/slCaMi6p92r/pLS8aeO/q6qeA=; b=mq7UGieZtmMoGhA9OvqIjLYB9hjM8VOG4n2KKB3BHefiqEosScv+5h/6wehxhfRKUP ryewKc3rY8DJFEN6WW8FVXRhO6auTXWJa3AYsG4Obhv9Dz9yaZI3iYX43BgS995JcGoY z5o54SNngRSaaAP188mZo6CrPO0iScAF9bD7Y493YMa0VWqemGALS2XEp91awD6vFvOl NmQ7c5e1V1n2IojQvcSFdZ2Z+VP7tAhi5nLXRBAPA223AK0xDgILRzH99pW3l+Frjvbw n30CJq5VEw8IEeK+VrBVBRLy/9n2UX7oX14+p0x6/9qNnSTbbeeEjIALrq4kqPixYxnQ KUDw== Received: by 10.152.110.40 with SMTP id hx8mr4110322lab.9.1346995795209; Thu, 06 Sep 2012 22:29:55 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id hg4sm4130446lab.11.2012.09.06.22.29.53 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 22:29:54 -0700 (PDT) From: Felipe Balbi To: Greg KH Subject: [PATCH v2] serial: omap: fix compile breakage Date: Fri, 7 Sep 2012 08:25:31 +0300 Message-Id: <1346995531-3197-1-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1346995312-2872-1-git-send-email-balbi@ti.com> References: <1346995312-2872-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQkkaNGIIEGM1/TIxM/cUK8WrOpEEKBfqSqJtHGc+SMnHh0Sy6caUQadgkXFM+iv8xxxnTM6 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.19 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: Tony Lindgren , Linux OMAP Mailing List , Felipe Balbi , Linux ARM Kernel Mailing List , linux-serial@vger.kernel.org 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 --- Changes since v1: . remove the fields from 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 57ff78c..74caddc 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h @@ -79,8 +79,4 @@ struct omap_uart_port_info { void (*enable_wakeup)(struct device *, bool); }; - - 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 e31d291..8e4a7aa 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -123,6 +123,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;