diff options
| author | Tejun Heo <htejun@gmail.com> | 2007-03-02 09:31:26 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-03-03 00:30:35 +0100 |
| commit | 438ac6d5e3f8106a6bd1a5682c508d660294a85d (patch) | |
| tree | 759aad55bb9850fe21709e12ca79cbdb3bf881f2 /drivers/ata/pata_ali.c | |
| parent | libata: add missing PM callbacks (diff) | |
| download | linux-438ac6d5e3f8106a6bd1a5682c508d660294a85d.tar.xz linux-438ac6d5e3f8106a6bd1a5682c508d660294a85d.zip | |
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 = { .slave_configure = ata_scsi_slave_config, .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, +#ifdef CONFIG_PM .resume = ata_scsi_device_resume, .suspend = ata_scsi_device_suspend, +#endif }; /* @@ -667,11 +669,13 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) return ata_pci_init_one(pdev, port_info, 2); } +#ifdef CONFIG_PM static int ali_reinit_one(struct pci_dev *pdev) { ali_init_chipset(pdev); return ata_pci_device_resume(pdev); } +#endif static const struct pci_device_id ali[] = { { PCI_VDEVICE(AL, PCI_DEVICE_ID_AL_M5228), }, @@ -685,8 +689,10 @@ static struct pci_driver ali_pci_driver = { .id_table = ali, .probe = ali_init_one, .remove = ata_pci_remove_one, +#ifdef CONFIG_PM .suspend = ata_pci_device_suspend, .resume = ali_reinit_one, +#endif }; static int __init ali_init(void) |