diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-29 12:41:09 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-29 12:41:09 -0500 |
| commit | d6fb89bf6b8b45ec8c911570ba0852940690d846 (patch) | |
| tree | 38e7d7c8f2b5b6f0ae1dd6e977154bcb48389a62 /drivers | |
| parent | b1d917739acd44e14eb13813e4c94dc4b6831ca3 (diff) | |
| parent | 9220a2d0daa1e6782f02d47303340d7b5ca62ac0 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/ahci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index f65a00fe81d9..c840d5ec12a7 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c | |||
| @@ -292,6 +292,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { | |||
| 292 | board_ahci }, /* ICH8M */ | 292 | board_ahci }, /* ICH8M */ |
| 293 | { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 293 | { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, |
| 294 | board_ahci }, /* JMicron JMB360 */ | 294 | board_ahci }, /* JMicron JMB360 */ |
| 295 | { 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | ||
| 296 | board_ahci }, /* JMicron JMB363 */ | ||
| 295 | { } /* terminate list */ | 297 | { } /* terminate list */ |
| 296 | }; | 298 | }; |
| 297 | 299 | ||