The patch titled
serial-add-driver-for-the-altera-uart-update
has been added to the -mm tree. Its filename is
serial-add-driver-for-the-altera-uart-update.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: serial-add-driver-for-the-altera-uart-update
From: Tobias Klauser <tklauser@xxxxxxxxxx>
- altera_uart: Remove usage of altera_uart_getppdcd, altera_uart_getppdtr,
altera_uart_setppdtr. This makes altera_uart actually compile again (verified
on x86_64 with Linus' master branch as of today).
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/serial/altera_uart.c | 3 ---
1 file changed, 3 deletions(-)
diff -puN drivers/serial/altera_uart.c~serial-add-driver-for-the-altera-uart-update drivers/serial/altera_uart.c
--- a/drivers/serial/altera_uart.c~serial-add-driver-for-the-altera-uart-update
+++ a/drivers/serial/altera_uart.c
@@ -97,8 +97,6 @@ static unsigned int altera_uart_get_mctr
(readl(port->membase + ALTERA_UART_STATUS_REG) &
ALTERA_UART_STATUS_CTS_MSK) ? TIOCM_CTS : 0;
sigs |= (pp->sigs & TIOCM_RTS);
- sigs |= (altera_uart_getppdcd(port->line) ? TIOCM_CD : 0);
- sigs |= (altera_uart_getppdtr(port->line) ? TIOCM_DTR : 0);
spin_unlock_irqrestore(&port->lock, flags);
return sigs;
@@ -111,7 +109,6 @@ static void altera_uart_set_mctrl(struct
spin_lock_irqsave(&port->lock, flags);
pp->sigs = sigs;
- altera_uart_setppdtr(port->line, (sigs & TIOCM_DTR));
if (sigs & TIOCM_RTS)
pp->imr |= ALTERA_UART_CONTROL_RTS_MSK;
else
_
Patches currently in -mm which might be from tklauser@xxxxxxxxxx are
linux-next.patch
serial-add-driver-for-the-altera-jtag-uart.patch
serial-add-driver-for-the-altera-uart.patch
serial-add-driver-for-the-altera-uart-update.patch
serial-add-driver-for-the-altera-uart-unbork.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
