Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Fri, 1 Nov 2002 07:53:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Fri, 1 Nov 2002 07:53:57 -0500 Received: from skunk.directfb.org ([212.84.236.169]:12428 "EHLO skunk.directfb.org") by vger.kernel.org with ESMTP id ; Fri, 1 Nov 2002 07:53:06 -0500 Date: Fri, 1 Nov 2002 13:59:23 +0100 From: Denis Oliver Kropp To: linux-kernel@vger.kernel.org Subject: Re: [PATCH-2.5] neofb 0.4.1 Message-ID: <20021101125923.GA25980@skunk.convergence.de> Reply-To: Denis Oliver Kropp References: <20021101124803.GA25848@skunk.convergence.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="ReaqsoxgOBHFXBhH" Content-Disposition: inline In-Reply-To: <20021101124803.GA25848@skunk.convergence.de> User-Agent: Mutt/1.4i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 11818 Lines: 439 --ReaqsoxgOBHFXBhH Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Quoting Denis Oliver Kropp (dok@directfb.org): > Hi, > > this patch replaces the neofb 0.4 patch and additionally > includes code style changes requested by Arnaldo Carvalho de Melo. I forgot to change the version number string, here's a new patch. -- Best regards, Denis Oliver Kropp .------------------------------------------. | DirectFB - Hardware accelerated graphics | | http://www.directfb.org/ | "------------------------------------------" Convergence GmbH --ReaqsoxgOBHFXBhH Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="linux-2.5.44-neofb-0.4.1.patch" diff -Naur linux-2.5.44/drivers/char/toshiba.c linux-2.5.44-neofb-0.4.1/drivers/char/toshiba.c --- linux-2.5.44/drivers/char/toshiba.c 2002-10-19 06:02:31.000000000 +0200 +++ linux-2.5.44-neofb-0.4.1/drivers/char/toshiba.c 2002-10-30 17:03:24.000000000 +0100 @@ -210,7 +210,7 @@ /* * Put the laptop into System Management Mode */ -static int tosh_smm(SMMRegisters *regs) +int tosh_smm(SMMRegisters *regs) { int eax; diff -Naur linux-2.5.44/drivers/video/neofb.c linux-2.5.44-neofb-0.4.1/drivers/video/neofb.c --- linux-2.5.44/drivers/video/neofb.c 2002-10-19 06:02:00.000000000 +0200 +++ linux-2.5.44-neofb-0.4.1/drivers/video/neofb.c 2002-11-01 12:57:56.000000000 +0100 @@ -1,7 +1,7 @@ /* * linux/drivers/video/neofb.c -- NeoMagic Framebuffer Driver * - * Copyright (c) 2001 Denis Oliver Kropp + * Copyright (c) 2001-2002 Denis Oliver Kropp * * * Card specific code is based on XFree86's neomagic driver. @@ -11,6 +11,16 @@ * Public License. See the file COPYING in the main directory of this * archive for more details. * + * + * 0.4.1 + * - Cosmetic changes (dok) + * + * 0.4 + * - Toshiba Libretto support, allow modes larger than LCD size if + * LCD is disabled, keep BIOS settings if internal/external display + * haven't been enabled explicitly + * (Thomas J. Moore ) + * * 0.3.3 * - Porting over to new fbdev api. (jsimmons) * @@ -56,6 +66,10 @@ #include #include #include +#ifdef CONFIG_TOSHIBA +#include +extern int tosh_smm(SMMRegisters *regs); +#endif #include #include @@ -70,17 +84,18 @@ #include