diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/m32r/kernel/io_usrv.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/m32r/kernel/io_usrv.c')
| -rw-r--r-- | arch/m32r/kernel/io_usrv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/io_usrv.c b/arch/m32r/kernel/io_usrv.c index 9eb161dcc104..39a379af40bc 100644 --- a/arch/m32r/kernel/io_usrv.c +++ b/arch/m32r/kernel/io_usrv.c | |||
| @@ -47,7 +47,7 @@ static inline void *_port2addr(unsigned long port) | |||
| 47 | else if (port >= UART1_IOSTART && port <= UART1_IOEND) | 47 | else if (port >= UART1_IOSTART && port <= UART1_IOEND) |
| 48 | port = ((port - UART1_IOSTART) << 1) + UART1_REGSTART; | 48 | port = ((port - UART1_IOSTART) << 1) + UART1_REGSTART; |
| 49 | #endif /* CONFIG_SERIAL_8250 || CONFIG_SERIAL_8250_MODULE */ | 49 | #endif /* CONFIG_SERIAL_8250 || CONFIG_SERIAL_8250_MODULE */ |
| 50 | return (void *)(port + NONCACHE_OFFSET); | 50 | return (void *)(port | (NONCACHE_OFFSET)); |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | static inline void delay(void) | 53 | static inline void delay(void) |