git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[sfrench/cifs-2.6.git]
/
drivers
/
ata
/
pata_scc.c
diff --git
a/drivers/ata/pata_scc.c
b/drivers/ata/pata_scc.c
index d9db3f8d60efa53de94332293a466ab0cc159678..fe36966f7e347dedd4781cef96fcec5ff79e62f3 100644
(file)
--- a/
drivers/ata/pata_scc.c
+++ b/
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 */
};