From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from host32.eke.fi (unknown [194.100.36.62]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTP id B313167DF4 for ; Fri, 10 Nov 2006 23:39:24 +1100 (EST) Date: Fri, 10 Nov 2006 14:02:30 +0200 (EET) From: Kalle Pokki To: Kalle Pokki Subject: Re: [PATCH] CPM_UART: Fix non-console initialisation (v2) In-Reply-To: Message-ID: References: <17748.21645.621069.105453@cargo.ozlabs.ibm.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Paul Mackerras , linuxppc-embedded@ozlabs.org List-Id: Linux on Embedded PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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