diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-08-11 16:46:14 -0700 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 19:33:19 +0200 |
| commit | 2a874182842c6a70f245b7f1ad859f9152517951 (patch) | |
| tree | c58ffd6ac72b406cd6981f71e2270865e4331ea6 /drivers/ieee1394/ohci1394.c | |
| parent | 611aa19fd60fe57059d9972fa6ae29f7472a13cf (diff) | |
| download | blackbird-obmc-linux-2a874182842c6a70f245b7f1ad859f9152517951.tar.gz blackbird-obmc-linux-2a874182842c6a70f245b7f1ad859f9152517951.zip | |
CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/ohci1394.c')
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index ea14c831ff41..9890ab73bb5f 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c @@ -3530,7 +3530,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) put_device(dev); } - +#ifdef CONFIG_PM static int ohci1394_pci_resume (struct pci_dev *pdev) { #ifdef CONFIG_PPC_PMAC @@ -3568,7 +3568,7 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state) return 0; } - +#endif #define PCI_CLASS_FIREWIRE_OHCI ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10) @@ -3591,8 +3591,10 @@ static struct pci_driver ohci1394_pci_driver = { .id_table = ohci1394_pci_tbl, .probe = ohci1394_pci_probe, .remove = ohci1394_pci_remove, +#ifdef CONFIG_PM .resume = ohci1394_pci_resume, .suspend = ohci1394_pci_suspend, +#endif }; /*********************************** |
