Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3db602bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge of 'new-ids' branch from 

	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
parents d20c507f 4c3a53d4

drivers/scsi/sata_promise.c

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ static struct ata_port_info pdc_port_info[] = { 
static struct pci_device_id pdc_ata_pci_tbl[] = {

	{ PCI_VENDOR_ID_PROMISE, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3571, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3373, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3375, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

drivers/scsi/sata_sil.c

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static struct pci_device_id sil_pci_tbl[] = { 
	{ 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },

	{ 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ 0x1002, 0x437a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ }	/* terminate list */

};