Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422661AbWA0XN0 (ORCPT ); Fri, 27 Jan 2006 18:13:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1422675AbWA0XN0 (ORCPT ); Fri, 27 Jan 2006 18:13:26 -0500 Received: from hansmi.home.forkbomb.ch ([213.144.146.165]:47644 "EHLO hansmi.home.forkbomb.ch") by vger.kernel.org with ESMTP id S1422661AbWA0XNZ (ORCPT ); Fri, 27 Jan 2006 18:13:25 -0500 Date: Sat, 28 Jan 2006 00:13:14 +0100 From: Michael Hanselmann To: linux-kernel@vger.kernel.org Cc: benh@kernel.crashing.org Subject: [PATCH] framebuffer: Remove old radeon driver Message-ID: <20060127231314.GA28324@hansmi.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 93509 Lines: 3217 This patch removes the old radeon driver which has been replaced by a newer one. Signed-off-by: Michael Hanselmann --- diff -Nrup --exclude-from linux-exclude-from linux-2.6.16-rc1.orig/drivers/video/Kconfig linux-2.6.16-rc1/drivers/video/Kconfig --- linux-2.6.16-rc1.orig/drivers/video/Kconfig 2006-01-18 00:29:19.000000000 +0100 +++ linux-2.6.16-rc1/drivers/video/Kconfig 2006-01-28 00:01:17.000000000 +0100 @@ -893,20 +893,6 @@ config FB_MATROX_MULTIHEAD There is no need for enabling 'Matrox multihead support' if you have only one Matrox card in the box. -config FB_RADEON_OLD - tristate "ATI Radeon display support (Old driver)" - depends on FB && PCI - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - select FB_MACMODES if PPC - help - Choose this option if you want to use an ATI Radeon graphics card as - a framebuffer device. There are both PCI and AGP versions. You - don't need to choose this to run the Radeon in plain VGA mode. - There is a product page at - . - config FB_RADEON tristate "ATI Radeon display support" depends on FB && PCI diff -Nrup --exclude-from linux-exclude-from linux-2.6.16-rc1.orig/drivers/video/Makefile linux-2.6.16-rc1/drivers/video/Makefile --- linux-2.6.16-rc1.orig/drivers/video/Makefile 2006-01-18 00:29:19.000000000 +0100 +++ linux-2.6.16-rc1/drivers/video/Makefile 2006-01-28 00:01:29.000000000 +0100 @@ -39,7 +39,6 @@ obj-$(CONFIG_FB_KYRO) += kyr obj-$(CONFIG_FB_SAVAGE) += savage/ obj-$(CONFIG_FB_GEODE) += geode/ obj-$(CONFIG_FB_I810) += vgastate.o -obj-$(CONFIG_FB_RADEON_OLD) += radeonfb.o obj-$(CONFIG_FB_NEOMAGIC) += neofb.o vgastate.o obj-$(CONFIG_FB_VIRGE) += virgefb.o obj-$(CONFIG_FB_3DFX) += tdfxfb.o diff -Nrup --exclude-from linux-exclude-from linux-2.6.16-rc1.orig/drivers/video/radeonfb.c linux-2.6.16-rc1/drivers/video/radeonfb.c --- linux-2.6.16-rc1.orig/drivers/video/radeonfb.c 2006-01-18 00:29:19.000000000 +0100 +++ linux-2.6.16-rc1/drivers/video/radeonfb.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,3167 +0,0 @@ -/* - * drivers/video/radeonfb.c - * framebuffer driver for ATI Radeon chipset video boards - * - * Copyright 2000 Ani Joshi - * - * - * ChangeLog: - * 2000-08-03 initial version 0.0.1 - * 2000-09-10 more bug fixes, public release 0.0.5 - * 2001-02-19 mode bug fixes, 0.0.7 - * 2001-07-05 fixed scrolling issues, engine initialization, - * and minor mode tweaking, 0.0.9 - * 2001-09-07 Radeon VE support, Nick Kurshev - * blanking, pan_display, and cmap fixes, 0.1.0 - * 2001-10-10 Radeon 7500 and 8500 support, and experimental - * flat panel support, 0.1.1 - * 2001-11-17 Radeon M6 (ppc) support, Daniel Berlin, 0.1.2 - * 2001-11-18 DFP fixes, Kevin Hendricks, 0.1.3 - * 2001-11-29 more cmap, backlight fixes, Benjamin Herrenschmidt - * 2002-01-18 DFP panel detection via BIOS, Michael Clark, 0.1.4 - * 2002-06-02 console switching, mode set fixes, accel fixes - * 2002-06-03 MTRR support, Peter Horton, 0.1.5 - * 2002-09-21 rv250, r300, m9 initial support, - * added mirror option, 0.1.6 - * - * Special thanks to ATI DevRel team for their hardware donations. - * - */ - - -#define RADEON_VERSION "0.1.6" - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#if defined(__powerpc__) -#include -#include -#include "macmodes.h" - -#ifdef CONFIG_NVRAM -#include -#endif - -#ifdef CONFIG_PMAC_BACKLIGHT -#include -#endif - -#ifdef CONFIG_BOOTX_TEXT -#include -#endif - -#ifdef CONFIG_ADB_PMU -#include -#include -#endif - -#endif /* __powerpc__ */ - -#ifdef CONFIG_MTRR -#include -#endif - -#include