git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
blackfin
/
include
/
asm
/
bfin_serial.h
diff --git
a/arch/blackfin/include/asm/bfin_serial.h
b/arch/blackfin/include/asm/bfin_serial.h
index
7dbc664
..
7fd0ec7
100644
(file)
--- a/
arch/blackfin/include/asm/bfin_serial.h
+++ b/
arch/blackfin/include/asm/bfin_serial.h
@@
-184,7
+184,7
@@
struct bfin_uart_regs {
#undef __BFP
#ifndef port_membase
#undef __BFP
#ifndef port_membase
-# define port_membase(p)
(((struct bfin_serial_port *)(p))->port.membase)
+# define port_membase(p)
0
#endif
#define UART_GET_CHAR(p) bfin_read16(port_membase(p) + OFFSET_RBR)
#endif
#define UART_GET_CHAR(p) bfin_read16(port_membase(p) + OFFSET_RBR)
@@
-235,10
+235,10
@@
struct bfin_uart_regs {
#define UART_SET_DLAB(p) do { UART_PUT_LCR(p, UART_GET_LCR(p) | DLAB); SSYNC(); } while (0)
#ifndef put_lsr_cache
#define UART_SET_DLAB(p) do { UART_PUT_LCR(p, UART_GET_LCR(p) | DLAB); SSYNC(); } while (0)
#ifndef put_lsr_cache
-# define put_lsr_cache(p, v)
(((struct bfin_serial_port *)(p))->lsr = (v))
+# define put_lsr_cache(p, v)
#endif
#ifndef get_lsr_cache
#endif
#ifndef get_lsr_cache
-# define get_lsr_cache(p)
(((struct bfin_serial_port *)(p))->lsr)
+# define get_lsr_cache(p)
0
#endif
/* The hardware clears the LSR bits upon read, so we need to cache
#endif
/* The hardware clears the LSR bits upon read, so we need to cache