tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds f8829150 ceb3b021

+7
+3
drivers/ata/ahci.c
··· 427 427 .driver_data = board_ahci_yes_fbs }, /* 88se9128 */ 428 428 { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9125), 429 429 .driver_data = board_ahci_yes_fbs }, /* 88se9125 */ 430 + { PCI_DEVICE_SUB(PCI_VENDOR_ID_MARVELL_EXT, 0x9178, 431 + PCI_VENDOR_ID_MARVELL_EXT, 0x9170), 432 + .driver_data = board_ahci_yes_fbs }, /* 88se9170 */ 430 433 { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a), 431 434 .driver_data = board_ahci_yes_fbs }, /* 88se9172 */ 432 435 { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9172),
+4
drivers/ata/sata_sis.c
··· 83 83 .id_table = sis_pci_tbl, 84 84 .probe = sis_init_one, 85 85 .remove = ata_pci_remove_one, 86 + #ifdef CONFIG_PM 87 + .suspend = ata_pci_device_suspend, 88 + .resume = ata_pci_device_resume, 89 + #endif 86 90 }; 87 91 88 92 static struct scsi_host_template sis_sht = {