diff options
author | Tejun Heo <htejun@gmail.com> | 2007-03-02 03:31:26 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-03-02 18:30:35 -0500 |
commit | 438ac6d5e3f8106a6bd1a5682c508d660294a85d (patch) | |
tree | 759aad55bb9850fe21709e12ca79cbdb3bf881f2 /drivers/ata/pata_via.c | |
parent | b23ff24436c97fb26428f3a337faf189292cc307 (diff) |
libata: add missing CONFIG_PM in LLDs
Add missing #ifdef CONFIG_PM conditionals around all PM related parts
in libata LLDs.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_via.c')
-rw-r--r-- | drivers/ata/pata_via.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index 20fc2d0dcfa1..946ade0e1f1b 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c | |||
@@ -305,8 +305,10 @@ static struct scsi_host_template via_sht = { | |||
305 | .slave_configure = ata_scsi_slave_config, | 305 | .slave_configure = ata_scsi_slave_config, |
306 | .slave_destroy = ata_scsi_slave_destroy, | 306 | .slave_destroy = ata_scsi_slave_destroy, |
307 | .bios_param = ata_std_bios_param, | 307 | .bios_param = ata_std_bios_param, |
308 | #ifdef CONFIG_PM | ||
308 | .resume = ata_scsi_device_resume, | 309 | .resume = ata_scsi_device_resume, |
309 | .suspend = ata_scsi_device_suspend, | 310 | .suspend = ata_scsi_device_suspend, |
311 | #endif | ||
310 | }; | 312 | }; |
311 | 313 | ||
312 | static struct ata_port_operations via_port_ops = { | 314 | static struct ata_port_operations via_port_ops = { |
@@ -560,6 +562,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
560 | return ata_pci_init_one(pdev, port_info, 2); | 562 | return ata_pci_init_one(pdev, port_info, 2); |
561 | } | 563 | } |
562 | 564 | ||
565 | #ifdef CONFIG_PM | ||
563 | /** | 566 | /** |
564 | * via_reinit_one - reinit after resume | 567 | * via_reinit_one - reinit after resume |
565 | * @pdev; PCI device | 568 | * @pdev; PCI device |
@@ -592,6 +595,7 @@ static int via_reinit_one(struct pci_dev *pdev) | |||
592 | } | 595 | } |
593 | return ata_pci_device_resume(pdev); | 596 | return ata_pci_device_resume(pdev); |
594 | } | 597 | } |
598 | #endif | ||
595 | 599 | ||
596 | static const struct pci_device_id via[] = { | 600 | static const struct pci_device_id via[] = { |
597 | { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C576_1), }, | 601 | { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C576_1), }, |
@@ -607,8 +611,10 @@ static struct pci_driver via_pci_driver = { | |||
607 | .id_table = via, | 611 | .id_table = via, |
608 | .probe = via_init_one, | 612 | .probe = via_init_one, |
609 | .remove = ata_pci_remove_one, | 613 | .remove = ata_pci_remove_one, |
614 | #ifdef CONFIG_PM | ||
610 | .suspend = ata_pci_device_suspend, | 615 | .suspend = ata_pci_device_suspend, |
611 | .resume = via_reinit_one, | 616 | .resume = via_reinit_one, |
617 | #endif | ||
612 | }; | 618 | }; |
613 | 619 | ||
614 | static int __init via_init(void) | 620 | static int __init via_init(void) |