The patch titled
atmel_serial: remove duplicated macro definition
has been removed from the -mm tree. Its filename was
atmel_serial-remove-duplicated-macro-definition.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: atmel_serial: remove duplicated macro definition
From: Michael Trimarchi <trimarchimichael@xxxxxxxx>
After commit 39d4c922b596633da86878b1a5cc881785b8e5fa (atmel_serial: fix
uart/console concurrent access) the UART_GET_TCR macro got redefined. This
patch removes the duplicated definition.
Signed-off-by: michael trimarchi <trimarchimichael@xxxxxxxxxxxxxxx>
Acked-by: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/serial/atmel_serial.c | 1 -
1 file changed, 1 deletion(-)
diff -puN drivers/serial/atmel_serial.c~atmel_serial-remove-duplicated-macro-definition drivers/serial/atmel_serial.c
--- a/drivers/serial/atmel_serial.c~atmel_serial-remove-duplicated-macro-definition
+++ a/drivers/serial/atmel_serial.c
@@ -96,7 +96,6 @@
/* PDC registers */
#define UART_PUT_PTCR(port,v) __raw_writel(v, (port)->membase + ATMEL_PDC_PTCR)
-#define UART_GET_TCR(port) __raw_readl((port)->membase + ATMEL_PDC_TCR)
#define UART_GET_PTSR(port) __raw_readl((port)->membase + ATMEL_PDC_PTSR)
#define UART_PUT_RPR(port,v) __raw_writel(v, (port)->membase + ATMEL_PDC_RPR)
_
Patches currently in -mm which might be from trimarchimichael@xxxxxxxx are
origin.patch
jffs2-summary-allocation-dont-use-vmalloc.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
