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_ali.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_ali.c')
-rw-r--r-- | drivers/ata/pata_ali.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index a90ed00c07e0..11ea552a58ca 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
@@ -345,8 +345,10 @@ static struct scsi_host_template ali_sht = { | |||
345 | .slave_configure = ata_scsi_slave_config, | 345 | .slave_configure = ata_scsi_slave_config, |
346 | .slave_destroy = ata_scsi_slave_destroy, | 346 | .slave_destroy = ata_scsi_slave_destroy, |
347 | .bios_param = ata_std_bios_param, | 347 | .bios_param = ata_std_bios_param, |
348 | #ifdef CONFIG_PM | ||
348 | .resume = ata_scsi_device_resume, | 349 | .resume = ata_scsi_device_resume, |
349 | .suspend = ata_scsi_device_suspend, | 350 | .suspend = ata_scsi_device_suspend, |
351 | #endif | ||
350 | }; | 352 | }; |
351 | 353 | ||
352 | /* | 354 | /* |
@@ -667,11 +669,13 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
667 | return ata_pci_init_one(pdev, port_info, 2); | 669 | return ata_pci_init_one(pdev, port_info, 2); |
668 | } | 670 | } |
669 | 671 | ||
672 | #ifdef CONFIG_PM | ||
670 | static int ali_reinit_one(struct pci_dev *pdev) | 673 | static int ali_reinit_one(struct pci_dev *pdev) |
671 | { | 674 | { |
672 | ali_init_chipset(pdev); | 675 | ali_init_chipset(pdev); |
673 | return ata_pci_device_resume(pdev); | 676 | return ata_pci_device_resume(pdev); |
674 | } | 677 | } |
678 | #endif | ||
675 | 679 | ||
676 | static const struct pci_device_id ali[] = { | 680 | static const struct pci_device_id ali[] = { |
677 | { PCI_VDEVICE(AL, PCI_DEVICE_ID_AL_M5228), }, | 681 | { PCI_VDEVICE(AL, PCI_DEVICE_ID_AL_M5228), }, |
@@ -685,8 +689,10 @@ static struct pci_driver ali_pci_driver = { | |||
685 | .id_table = ali, | 689 | .id_table = ali, |
686 | .probe = ali_init_one, | 690 | .probe = ali_init_one, |
687 | .remove = ata_pci_remove_one, | 691 | .remove = ata_pci_remove_one, |
692 | #ifdef CONFIG_PM | ||
688 | .suspend = ata_pci_device_suspend, | 693 | .suspend = ata_pci_device_suspend, |
689 | .resume = ali_reinit_one, | 694 | .resume = ali_reinit_one, |
695 | #endif | ||
690 | }; | 696 | }; |
691 | 697 | ||
692 | static int __init ali_init(void) | 698 | static int __init ali_init(void) |