aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-08-11 19:46:14 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-09-17 13:33:19 -0400
commit2a874182842c6a70f245b7f1ad859f9152517951 (patch)
treec58ffd6ac72b406cd6981f71e2270865e4331ea6
parent611aa19fd60fe57059d9972fa6ae29f7472a13cf (diff)
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>
-rw-r--r--drivers/ieee1394/ohci1394.c6
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)
3530 put_device(dev); 3530 put_device(dev);
3531} 3531}
3532 3532
3533 3533#ifdef CONFIG_PM
3534static int ohci1394_pci_resume (struct pci_dev *pdev) 3534static int ohci1394_pci_resume (struct pci_dev *pdev)
3535{ 3535{
3536#ifdef CONFIG_PPC_PMAC 3536#ifdef CONFIG_PPC_PMAC
@@ -3568,7 +3568,7 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
3568 3568
3569 return 0; 3569 return 0;
3570} 3570}
3571 3571#endif
3572 3572
3573#define PCI_CLASS_FIREWIRE_OHCI ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10) 3573#define PCI_CLASS_FIREWIRE_OHCI ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10)
3574 3574
@@ -3591,8 +3591,10 @@ static struct pci_driver ohci1394_pci_driver = {
3591 .id_table = ohci1394_pci_tbl, 3591 .id_table = ohci1394_pci_tbl,
3592 .probe = ohci1394_pci_probe, 3592 .probe = ohci1394_pci_probe,
3593 .remove = ohci1394_pci_remove, 3593 .remove = ohci1394_pci_remove,
3594#ifdef CONFIG_PM
3594 .resume = ohci1394_pci_resume, 3595 .resume = ohci1394_pci_resume,
3595 .suspend = ohci1394_pci_suspend, 3596 .suspend = ohci1394_pci_suspend,
3597#endif
3596}; 3598};
3597 3599
3598/*********************************** 3600/***********************************