Commit 533462df authored Nov 13, 2006 by Kalle Pokki Committed by Paul Mackerras Dec 04, 2006

[POWERPC] CPM_UART: Fix inconsistency of function definition



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>

parent 1d30593e

drivers/serial/cpm_uart/cpm_uart_cpm2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;