]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[POWERPC] CPM_UART: Fix inconsistency of function definition
authorKalle Pokki <kalle.pokki@iki.fi>
Mon, 13 Nov 2006 08:22:30 +0000 (11:22 +0300)
committerPaul Mackerras <paulus@samba.org>
Mon, 4 Dec 2006 09:39:25 +0000 (20:39 +1100)
The below hunk was missed from the recent patch, and now, there are somewhat
inconsistent definitions:

in cpm_uart.h:
int __init cpm_uart_init_portdesc(void);

in cpm_uart_cpm1.c:
int __init cpm_uart_init_portdesc(void)
{
}

in cpm_uart_cpm2.c:
int cpm_uart_init_portdesc(void)
{
}

Signed-off-by: Kalle Pokki <kalle.pokki@iki.fi>
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
drivers/serial/cpm_uart/cpm_uart_cpm2.c

index b691d3e14754fa94a40ff0eac22889b2e2afda33..787a8f134677c0a1b7f0f8ab17778bb267dd247a 100644 (file)
@@ -282,7 +282,7 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 }
 
 /* Setup any dynamic params in the uart desc */
-int cpm_uart_init_portdesc(void)
+int __init cpm_uart_init_portdesc(void)
 {
 #if defined(CONFIG_SERIAL_CPM_SMC1) || defined(CONFIG_SERIAL_CPM_SMC2)
        u32 addr;