From 0f9ec0a828565c4d2dcb01ce6af824c001396357 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Thu, 15 Feb 2007 12:43:06 -0500 Subject: [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 --- drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/serial') 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"); -- cgit v1.2.3-18-g5258