[PATCH] CPM_UART: Fix non-console initialisation (v2)

Kalle Pokki kalle.pokki at iki.fi
Fri Nov 10 23:02:30 EST 2006


On Fri, 10 Nov 2006, Kalle Pokki wrote:

> OK, better drop all the hunks except the one that concerns
> drivers/serial/cpm_uart/cpm_uart_core.c then, since I added the same
> '__init' lines in cpm_uart.h, cpm_uart_cpm1.c, and cpm_uart_cpm2.c.

Hmm, it seems you already pushed the changes. This should apply to the 
current 'merge' branch.

 drivers/serial/cpm_uart/cpm_uart_cpm2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index b691d3e..787a8f1 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -282,7 +282,7 @@ void cpm_uart_freebuf(struct uart_cpm_po
 }
 
 /* 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;
-- 
1.4.1.1




More information about the Linuxppc-embedded mailing list