From patchwork Thu Jul 15 19:08:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Huewe X-Patchwork-Id: 112316 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6FJ9505012214 for ; Thu, 15 Jul 2010 19:09:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934509Ab0GOTIh (ORCPT ); Thu, 15 Jul 2010 15:08:37 -0400 Received: from mail.gmx.net ([213.165.64.20]:47905 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S934317Ab0GOTIg (ORCPT ); Thu, 15 Jul 2010 15:08:36 -0400 Received: (qmail invoked by alias); 15 Jul 2010 19:08:33 -0000 Received: from dslb-084-056-035-216.pools.arcor-ip.net (EHLO lamer.localnet) [84.56.35.216] by mail.gmx.net (mp032) with SMTP; 15 Jul 2010 21:08:33 +0200 X-Authenticated: #12255092 X-Provags-ID: V01U2FsdGVkX19PduZxBK1P2jNMq+BKmFdR8NRaXDquq/kjL52hbB QWRXhcYjG7vLjZ From: Peter Huewe To: Kernel Janitors Subject: [PATCH 24/25] video/ivtv: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) Date: Thu, 15 Jul 2010 21:08:26 +0200 User-Agent: KMail/1.12.4 (Linux/2.6.34; KDE/4.3.5; x86_64; ; ) Cc: Andy Walls , Mauro Carvalho Chehab , Ian Armstrong , Douglas Schilling Landgraf , Steven Toth , ivtv-devel@ivtvdriver.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-Id: <201007152108.27175.PeterHuewe@gmx.de> X-Y-GMX-Trusted: 0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 15 Jul 2010 19:09:28 +0000 (UTC) diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 90daa6e..8e73ab9 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c @@ -69,10 +69,8 @@ int ivtv_first_minor; /* add your revision and whatnot here */ static struct pci_device_id ivtv_pci_tbl[] __devinitdata = { - {PCI_VENDOR_ID_ICOMP, PCI_DEVICE_ID_IVTV15, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {PCI_VENDOR_ID_ICOMP, PCI_DEVICE_ID_IVTV16, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, + {PCI_VDEVICE(ICOMP, PCI_DEVICE_ID_IVTV15), 0}, + {PCI_VDEVICE(ICOMP, PCI_DEVICE_ID_IVTV16), 0}, {0,} };