Merge branch 'upstream-fixes'

2006-01-29 12:41:09 -05:00 · 2006-01-29 12:41:09 -05:00 · d6fb89bf6b
parent b1d917739a 9220a2d0da
commit d6fb89bf6b
1 changed files with 2 additions and 0 deletions
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@ -292,6 +292,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
 	  board_ahci }, /* ICH8M */
 	{ 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
 	  board_ahci }, /* JMicron JMB360 */
+	{ 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+	  board_ahci }, /* JMicron JMB363 */
 	{ }	/* terminate list */
 };