commit 0f9ec0a828565c4d2dcb01ce6af824c001396357
author Paul Gortmaker <paul.gortmaker@windriver.com> Thu Feb 15 12:43:06 2007 -0500
committer Paul Mackerras <paulus@samba.org> Fri Feb 16 14:00:19 2007 +1100
tree 292c96404afe3fd9f5afc892b3a990828a7b08b7
parent c91ef5986185c044a853d990670e3f7ce22f2991

[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>

drivers/serial/cpm_uart/cpm_uart_cpm2.c

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 @@
 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");