From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264089AbTDJPzj (for ); Thu, 10 Apr 2003 11:55:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264090AbTDJPzj (for ); Thu, 10 Apr 2003 11:55:39 -0400 Received: from smtp03.web.de ([217.72.192.158]:35080 "EHLO smtp.web.de") by vger.kernel.org with ESMTP id S264089AbTDJPzh (for ); Thu, 10 Apr 2003 11:55:37 -0400 From: Michael Buesch To: bboett@adlp.org Subject: Re: 2.5.67 compile problem... Date: Thu, 10 Apr 2003 18:06:59 +0200 User-Agent: KMail/1.5 References: <20030408180604.GA3709@adlp.org> <200304082056.12305.freesoftwaredeveloper@web.de> <20030410142506.GM29225@adlp.org> In-Reply-To: <20030410142506.GM29225@adlp.org> Cc: linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200304101806.59241.freesoftwaredeveloper@web.de> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 10 April 2003 16:25, Bruno Boettcher wrote: > On Tue, Apr 08, 2003 at 08:56:12PM +0200, Michael Buesch wrote: > > This may fix it. (It's not tested) > > partly :D oops. :) Give this one a try: (patch against 2.5.67) --- drivers/block/ps2esdi.c.orig 2003-04-10 17:44:57.000000000 +0200 +++ drivers/block/ps2esdi.c 2003-04-10 18:01:48.000000000 +0200 @@ -107,7 +107,7 @@ static int ps2esdi_slot = -1; static int tp720esdi = 0; /* Is it Integrated ESDI of ThinkPad-720? */ static int intg_esdi = 0; /* If integrated adapter */ -struct ps2esdi_i_struct { +struct ps2_esdi_i_struct { unsigned int head, sect, cyl, wpcom, lzone, ctl; }; static spinlock_t ps2esdi_lock = SPIN_LOCK_UNLOCKED; @@ -165,7 +165,6 @@ return 0; } /* ps2esdi_init */ -module_init(ps2esdi_init); #ifdef MODULE @@ -200,6 +199,8 @@ void cleanup_module(void) { + int i; + if(ps2esdi_slot) { mca_mark_as_unused(ps2esdi_slot); mca_set_adapter_procfn(ps2esdi_slot, NULL, NULL); @@ -214,6 +215,8 @@ put_disk(ps2esdi_gendisk[i]); } } +#else /* MODULE */ +module_init(ps2esdi_init); #endif /* MODULE */ /* handles boot time command line parameters */ Regards Michael Buesch. -- My homepage: http://www.8ung.at/tuxsoft fighting for peace is like fu**ing for virginity