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

Commit f8829150 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata fixes from Tejun Heo:
 "Late fixes for libata.  Nothing too interesting.  Adding missing PM
  callbacks to satat_sis and an additional PCI ID for ahci"

* 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  sata_sis: missing PM support
  ahci: add PCI ID for Marvell 88SE9170 SATA controller
parents ceb3b021 55c82a6c

drivers/ata/ahci.c

+3 −0
Original line number Diff line number Diff line
@@ -427,6 +427,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	  .driver_data = board_ahci_yes_fbs },			/* 88se9128 */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9125),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9125 */

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_MARVELL_EXT, 0x9178,

			 PCI_VENDOR_ID_MARVELL_EXT, 0x9170),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9170 */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9172),

drivers/ata/sata_sis.c

+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ static struct pci_driver sis_pci_driver = { 
	.id_table		= sis_pci_tbl,

	.probe			= sis_init_one,

	.remove			= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend		= ata_pci_device_suspend,

	.resume			= ata_pci_device_resume,

#endif

};



static struct scsi_host_template sis_sht = {