]> err.no Git - linux-2.6/commitdiff
CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c
authorAlexey Dobriyan <adobriyan@gmail.com>
Fri, 11 Aug 2006 23:46:14 +0000 (16:46 -0700)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Sun, 17 Sep 2006 17:33:19 +0000 (19:33 +0200)
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>
drivers/ieee1394/ohci1394.c

index ea14c831ff41eb274134f308f2b2b50441b17a85..9890ab73bb5ff0e9cbe737277d75bdc48906b523 100644 (file)
@@ -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
 };
 
 /***********************************