diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 14:51:50 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 14:51:50 +0200 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /drivers/scsi/sata_nv.c | |
| parent | [PATCH] powerpc: merge semaphore.h (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-ucb (diff) | |
| download | linux-e5baa396af7560382d2cf3f0871d616b61fc284c.tar.xz linux-e5baa396af7560382d2cf3f0871d616b61fc284c.zip | |
Merge from Linus' tree.
Diffstat (limited to 'drivers/scsi/sata_nv.c')
| -rw-r--r-- | drivers/scsi/sata_nv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c index a1d62dee3be6..c05653c7779d 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/scsi/sata_nv.c @@ -158,6 +158,8 @@ static struct pci_device_id nv_pci_tbl[] = { PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP51 }, { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 }, + { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 }, { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC }, |