| commit | d6fb89bf6b8b45ec8c911570ba0852940690d846 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jgarzik@pobox.com> | Sun Jan 29 12:41:09 2006 -0500 |
| committer | Jeff Garzik <jgarzik@pobox.com> | Sun Jan 29 12:41:09 2006 -0500 |
| tree | 38e7d7c8f2b5b6f0ae1dd6e977154bcb48389a62 | |
| parent | b1d917739acd44e14eb13813e4c94dc4b6831ca3 [diff] | |
| parent | 9220a2d0daa1e6782f02d47303340d7b5ca62ac0 [diff] |
Merge branch 'upstream-fixes'
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index f65a00f..c840d5e 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c
@@ -292,6 +292,8 @@ 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 */ };