From a28bc05e9b761941544bc5d44ce54e8f449ff7d8 Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Thu, 15 Jul 2010 20:39:43 +0200
Subject: [PATCH] --- yaml --- r: 205208 b: refs/heads/master c:
 af4d6e257dc36646bb62adececdd10ad83323788 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/ata/pata_scc.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c30fc88d7d58..bf9ab0b5df55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b6ae5ba0c45c4d04721537308728688414c9e6b
+refs/heads/master: af4d6e257dc36646bb62adececdd10ad83323788
diff --git a/trunk/drivers/ata/pata_scc.c b/trunk/drivers/ata/pata_scc.c
index d9db3f8d60ef..fe36966f7e34 100644
--- a/trunk/drivers/ata/pata_scc.c
+++ b/trunk/drivers/ata/pata_scc.c
@@ -168,8 +168,7 @@ static const unsigned long JCACTSELtbl[2][7] = {
 };
 
 static const struct pci_device_id scc_pci_tbl[] = {
-	{PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{ PCI_VDEVICE(TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA), 0},
 	{ }	/* terminate list */
 };