projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1ec61e
)
atmel_serial: remove duplicated macro definition
author
Michael Trimarchi
<
[email protected]
>
Mon, 28 Apr 2008 09:14:11 +0000
(
02:14
-0700)
committer
Linus Torvalds
<
[email protected]
>
Mon, 28 Apr 2008 15:58:30 +0000
(08:58 -0700)
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 <
[email protected]
>
Acked-by: Haavard Skinnemoen <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/serial/atmel_serial.c
patch
|
blob
|
history
diff --git
a/drivers/serial/atmel_serial.c
b/drivers/serial/atmel_serial.c
index 55492fa095a2fab26fe7505143f662d665261fbf..c065a704a93ab68cfe167d73f67edbb700a8420c 100644
(file)
--- a/
drivers/serial/atmel_serial.c
+++ b/
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)