From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sccrmhc13.comcast.net ([204.127.202.64]) by speech.braille.uwo.ca with esmtp (Exim 3.36 #1 (Debian)) id 1CNCci-0008CH-00 for ; Thu, 28 Oct 2004 11:55:36 -0400 Received: from linux1.home (c-67-164-133-28.client.comcast.net[67.164.133.28]) by comcast.net (sccrmhc13) with ESMTP id <2004102815545501600jabq2e>; Thu, 28 Oct 2004 15:54:56 +0000 Received: by linux1.home (Postfix, from userid 1000) id 8B1B78088; Thu, 28 Oct 2004 10:54:54 -0500 (CDT) Date: Thu, 28 Oct 2004 10:54:54 -0500 From: William Hubbs To: speakup mailing list Message-ID: <20041028155454.GA12857@linux1.home> Mail-Followup-To: speakup mailing list Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; x-action=pgp-signed Content-Disposition: inline User-Agent: Mutt/1.5.6i Subject: speakup patch failing with 2.6.10-rc1 X-BeenThere: speakup@braille.uwo.ca X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Speakup is a screen review system for Linux." List-Id: "Speakup is a screen review system for Linux." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2004 15:55:42 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi all, I just attempted to patch speakup into version 2.6.10-rc1 of the kernel, and one hunt failed -- I got the following .rej file: /usr/src/linux/drivers/char/vt.c.rej which has this contents: *************** *** 2146,2151 **** /* we only changed when the console had already been allocated - a new console is not created in an interrupt routine */ } want_console = -1; } - --- 2156,2162 ---- /* we only changed when the console had already been allocated - a new console is not created in an interrupt routine */ + speakup_con_update(want_console); } want_console = -1; } how do I fix this? Thanks, William -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) iD8DBQFBgRZOblQW9DDEZTgRAmHaAJ4sBd8ityuHNQUTvj97+kWaU+azsQCfdy1p tzKibm9jWGYgNdFvfTBBltk= =k1Wg -----END PGP SIGNATURE-----