summaryrefslogtreecommitdiffstats
path: root/drivers/serial/cpm_uart
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2007-02-15 12:43:06 -0500
committerPaul Mackerras <paulus@samba.org>2007-02-16 14:00:19 +1100
commit0f9ec0a828565c4d2dcb01ce6af824c001396357 (patch)
tree292c96404afe3fd9f5afc892b3a990828a7b08b7 /drivers/serial/cpm_uart
parentc91ef5986185c044a853d990670e3f7ce22f2991 (diff)
downloadop-kernel-dev-0f9ec0a828565c4d2dcb01ce6af824c001396357.zip
op-kernel-dev-0f9ec0a828565c4d2dcb01ce6af824c001396357.tar.gz
[POWERPC] Fix compile failure in cpm_uart_cpm2
Fix bug that exists in kernel.org since 2.6.17rc4 - compiles fail if CONFIG_SERIAL_CPM_SMC is defined. Tested on a board using SMC1 console. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/serial/cpm_uart')
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_cpm2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index 787a8f1..fa45599 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -285,7 +285,7 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
int __init cpm_uart_init_portdesc(void)
{
#if defined(CONFIG_SERIAL_CPM_SMC1) || defined(CONFIG_SERIAL_CPM_SMC2)
- u32 addr;
+ u16 *addr;
#endif
pr_debug("CPM uart[-]:init portdesc\n");
OpenPOWER on IntegriCloud