From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264538AbTFQB6m (ORCPT ); Mon, 16 Jun 2003 21:58:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264531AbTFQB5G (ORCPT ); Mon, 16 Jun 2003 21:57:06 -0400 Received: from palrel11.hp.com ([156.153.255.246]:58803 "EHLO palrel11.hp.com") by vger.kernel.org with ESMTP id S264538AbTFQB4S (ORCPT ); Mon, 16 Jun 2003 21:56:18 -0400 Date: Mon, 16 Jun 2003 19:10:10 -0700 To: Marcelo Tosatti , Jeff Garzik , Linux kernel mailing list Subject: [PATCH 2.4] Static init fixes Message-ID: <20030617021010.GJ30944@bougret.hpl.hp.com> Reply-To: jt@hpl.hp.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.28i Organisation: HP Labs Palo Alto Address: HP Labs, 1U-17, 1501 Page Mill road, Palo Alto, CA 94304, USA. E-mail: jt@hpl.hp.com From: Jean Tourrilhes Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org ir241_static_init.diff : o [CORRECT] fix some obvious static init bugs. diff -u -p linux/net/irda/irda_device.d0.c linux/net/irda/irda_device.c --- linux/net/irda/irda_device.d0.c Mon Jun 16 16:57:31 2003 +++ linux/net/irda/irda_device.c Mon Jun 16 17:06:46 2003 @@ -68,6 +68,7 @@ extern int actisys_init(void); extern int girbil_init(void); extern int sa1100_irda_init(void); extern int ep7211_ir_init(void); +extern int mcp2120_init(void); static void __irda_task_delete(struct irda_task *task); @@ -122,6 +123,9 @@ int __init irda_device_init( void) /* * Call the init function of the device drivers that has not been * compiled as a module + * Note : non-modular IrDA is not supported in 2.4.X, so don't + * waste too much time fixing this code. If you require it, please + * upgrade to the IrDA stack in 2.5.X. Jean II */ #ifdef CONFIG_IRTTY_SIR irtty_init(); @@ -135,7 +139,7 @@ int __init irda_device_init( void) #ifdef CONFIG_NSC_FIR nsc_ircc_init(); #endif -#ifdef CONFIG_TOSHIBA_FIR +#ifdef CONFIG_TOSHIBA_OLD toshoboe_init(); #endif #ifdef CONFIG_SMC_IRCC_FIR @@ -161,6 +165,9 @@ int __init irda_device_init( void) #endif #ifdef CONFIG_EP7211_IR ep7211_ir_init(); +#endif +#ifdef CONFIG_MCP2120_DONGLE + mcp2120_init(); #endif return 0; }