From patchwork Tue Mar 1 17:50:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Hade X-Patchwork-Id: 600211 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p21HocVV010750 for ; Tue, 1 Mar 2011 17:50:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753982Ab1CARuh (ORCPT ); Tue, 1 Mar 2011 12:50:37 -0500 Received: from e35.co.us.ibm.com ([32.97.110.153]:54216 "EHLO e35.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753542Ab1CARug (ORCPT ); Tue, 1 Mar 2011 12:50:36 -0500 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p21HZmLl029912; Tue, 1 Mar 2011 10:35:48 -0700 Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p21HoTfU098156; Tue, 1 Mar 2011 10:50:29 -0700 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p21HtAOv009289; Tue, 1 Mar 2011 10:55:11 -0700 Received: from garyh-laptop.beaverton.ibm.com (garyh-laptop.beaverton.ibm.com [9.47.29.98]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p21HtAO0009235 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 1 Mar 2011 10:55:10 -0700 Received: from garyh-laptop.beaverton.ibm.com (localhost [127.0.0.1]) by garyh-laptop.beaverton.ibm.com (8.14.2/8.14.2/Debian-2build1) with ESMTP id p21HoSQT019291; Tue, 1 Mar 2011 09:50:28 -0800 Received: (from garyh@localhost) by garyh-laptop.beaverton.ibm.com (8.14.2/8.14.2/Submit) id p21HoQkH019290; Tue, 1 Mar 2011 09:50:26 -0800 X-Authentication-Warning: garyh-laptop.beaverton.ibm.com: garyh set sender to garyhade@us.ibm.com using -f Date: Tue, 1 Mar 2011 09:50:26 -0800 From: Gary Hade To: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Darrick J. Wong" , Krzysztof Helt , Petr Vandrovec , Andrew Morton , Linus Torvalds , Gary Hade Subject: matroxfb: remove incorrect Matrox G200eV support Message-ID: <20110301175026.GA18770@us.ibm.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 01 Mar 2011 17:50:38 +0000 (UTC) diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index a082deb..a74439a 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c @@ -1461,13 +1461,6 @@ static struct board { MGA_G100, &vbG100, "MGA-G100 (AGP)"}, - {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200EV_PCI, 0xFF, - 0, 0, - DEVF_G200, - 230000, - MGA_G200, - &vbG200, - "MGA-G200eV (PCI)"}, {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_PCI, 0xFF, 0, 0, DEVF_G200, @@ -2119,8 +2112,6 @@ static struct pci_device_id matroxfb_devices[] = { PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G100_AGP, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200EV_PCI, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_PCI, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_AGP,