Skip to content

Commit

Permalink
CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexey Dobriyan authored and Stefan Richter committed Sep 17, 2006
1 parent 611aa19 commit 2a87418
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/ieee1394/ohci1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand All @@ -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
};

/***********************************
Expand Down

0 comments on commit 2a87418

Please sign in to comment.