From: Paul Gortmaker Date: Thu, 15 Feb 2007 17:43:06 +0000 (-0500) Subject: [POWERPC] Fix compile failure in cpm_uart_cpm2 X-Git-Tag: v2.6.21-rc1~77^2~13 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0f9ec0a828565c4d2dcb01ce6af824c001396357;p=~emulex%2Finfiniband.git [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 Signed-off-by: Paul Mackerras --- diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c index 787a8f13467..fa455996ad8 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");