diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-04-26 00:19:26 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 15:16:40 -0400 |
| commit | 4b22afd743a3882123a16135fa863558c0ac2d94 (patch) | |
| tree | 1d6c244f112c9faeb19021c87d46c00df7f1ae84 | |
| parent | a473446856374668c4296db5256ca708ce8f7095 (diff) | |
| download | blackbird-op-linux-4b22afd743a3882123a16135fa863558c0ac2d94.tar.gz blackbird-op-linux-4b22afd743a3882123a16135fa863558c0ac2d94.zip | |
drivers/ata/pata_cmd640.c: fix build with CONFIG_PM=n
This is grubby, but all the ata drivers do it this way.
Would it not be better to do
#define ata_scsi_device_resume NULL
in libata.h, remove all those ifdefs?
(updated version, ug, ug)
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/ata/pata_cmd640.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c index ab9468d16edb..2105985a8013 100644 --- a/drivers/ata/pata_cmd640.c +++ b/drivers/ata/pata_cmd640.c @@ -181,8 +181,10 @@ static struct scsi_host_template cmd640_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 }; static struct ata_port_operations cmd640_port_ops = { @@ -267,7 +269,11 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id) static int cmd640_reinit_one(struct pci_dev *pdev) { cmd640_hardware_init(pdev); +#ifdef CONFIG_PM return ata_pci_device_resume(pdev); +#else + return 0; +#endif } static const struct pci_device_id cmd640[] = { @@ -280,7 +286,9 @@ static struct pci_driver cmd640_pci_driver = { .id_table = cmd640, .probe = cmd640_init_one, .remove = ata_pci_remove_one, +#ifdef CONFIG_PM .suspend = ata_pci_device_suspend, +#endif .resume = cmd640_reinit_one, }; |
