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: 1419581 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 5BFEBDF283 for ; Fri, 7 Sep 2012 05:30:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751501Ab2IGF37 (ORCPT ); Fri, 7 Sep 2012 01:29:59 -0400 Received: from na3sys009aog105.obsmtp.com ([74.125.149.75]:56307 "EHLO na3sys009aog105.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752075Ab2IGF36 (ORCPT ); Fri, 7 Sep 2012 01:29:58 -0400 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]) (using TLSv1) by na3sys009aob105.postini.com ([74.125.148.12]) with SMTP ID DSNKUEmGVEvkC9Xj3njxXyJYvhJddYGj4Fm1@postini.com; Thu, 06 Sep 2012 22:29:57 PDT Received: by lagy9 with SMTP id y9so1604932lag.19 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=QNEuPdUDC81FeAyZWrWySWkHf3Nunp3x3+LxQjSQ4r8sj7wpfkmn8bBN5CfrbK1VRf 9uFOUtoCCyJLYS2N+dumAuuAfhxD/L3siQ6OosvvtmzaoROKkixc5R0PZdqhOYMjy1LQ yvziXqDty09hqRVHtL5Rzr9haYX8lTodFQPGpFBZ4bkE6vofa/tE+fdZuCNQ35Iq51zy +/2LAHdqwHavWl346FwjYsA0u8gGvcQaqlBt+VRG7AbnCWNl2bZ8GrQof89jjrKtWWpT 7ScmizN8/f/RKxUyxN/wiBs7ip7g3eZG9EvbfvR3oPi/1Z1NBJkCsltTPwbO6tcu3+q+ xe1w== 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 Cc: linux-serial@vger.kernel.org, Tony Lindgren , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi 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: ALoCoQkkQsfZhUP4O3aY2vmoHXiiABZlgOwJYxGirBNIRZx9g5zREcT35ds5LS57u8QxDoA2+fVZ 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 --- 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;