From patchwork Fri Sep 7 05:21:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1419561 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 D91D3DF283 for ; Fri, 7 Sep 2012 05:26:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752740Ab2IGF0Z (ORCPT ); Fri, 7 Sep 2012 01:26:25 -0400 Received: from na3sys009aog131.obsmtp.com ([74.125.149.247]:57048 "EHLO na3sys009aog131.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751501Ab2IGF0Y (ORCPT ); Fri, 7 Sep 2012 01:26:24 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]) (using TLSv1) by na3sys009aob131.postini.com ([74.125.148.12]) with SMTP ID DSNKUEmFeghDYt6eQ0tcCt6WXD/3iPNt1eNV@postini.com; Thu, 06 Sep 2012 22:26:23 PDT Received: by lbbgj3 with SMTP id gj3so1637533lbb.19 for ; Thu, 06 Sep 2012 22:26:16 -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:x-gm-message-state; bh=+fg+6yF8WFMPmj2k1hHXrY/xE2it9oiCwoXuBfJMMX8=; b=VzfGq2VAbiiNuW+vbIf0hTF8dffaQS+Fmfb6N3EYnap/5ppjdhfGiwpM9s19Urb1s8 dn00t+9C8D8a2nwjOgaZRsVb8FAK/fjv5Utp6LFsMixVb80E2soutkqCTTa8LtXCHZBV cYixaKFMHYg0VVmTDtdrk7NWURJAVPkyRNe0L3pzTJnRpOs4KWQsPivViI9BpY4JnY03 RTCOhTF6aisdiV/imQfA8+HnP62rcQ0n/VhObs8qgIhbsEKm5QewgLYtq1tDMbZkQixO z/boBenc6ZhWD9s1fCI73IOIP6caqJZ0z1p1hNpKYW9/J+rtMvBM7ZpbVCjXrYW3qeiZ LPjg== Received: by 10.152.147.72 with SMTP id ti8mr4066807lab.20.1346995576570; Thu, 06 Sep 2012 22:26:16 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id mq9sm4141038lab.0.2012.09.06.22.26.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 22:26:15 -0700 (PDT) From: Felipe Balbi To: Greg KH Cc: linux-serial@vger.kernel.org, Tony Lindgren , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi Subject: [PATCH] serial: omap: fix compile breakage Date: Fri, 7 Sep 2012 08:21:52 +0300 Message-Id: <1346995312-2872-1-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 X-Gm-Message-State: ALoCoQkdUkrzZEBJTB9JzFLA01rLAttD9eBNPFLWzzI8UXsWeAHTwT9tATbV907DxGtRjIgdiXl4 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 --- drivers/tty/serial/omap-serial.c | 4 ++++ 1 file changed, 4 insertions(+) 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;