From: Felipe Balbi <balbi@ti.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: linux-serial@vger.kernel.org, Tony Lindgren <tony@atomide.com>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Linux ARM Kernel Mailing List
<linux-arm-kernel@lists.infradead.org>,
Felipe Balbi <balbi@ti.com>
Subject: [PATCH v2] serial: omap: fix compile breakage
Date: Fri, 7 Sep 2012 08:25:31 +0300 [thread overview]
Message-ID: <1346995531-3197-1-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1346995312-2872-1-git-send-email-balbi@ti.com>
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 <tony@atomide.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
Changes since v1:
. remove the fields from <plat/omap-serial.h>
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;
--
1.7.12.rc3
next prev parent reply other threads:[~2012-09-07 5:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-07 5:21 [PATCH] serial: omap: fix compile breakage Felipe Balbi
2012-09-07 5:25 ` Felipe Balbi [this message]
2012-09-07 15:31 ` [PATCH v2] " Greg KH
2012-09-07 15:34 ` [PATCH] " Felipe Balbi
2012-09-07 15:40 ` Greg KH
2012-09-07 17:57 ` Tony Lindgren
2012-09-07 18:10 ` [PATCH] serial: omap: fix DeviceTree boot Felipe Balbi
2012-09-07 18:26 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346995531-3197-1-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).