Commit 5b624ac3 authored by Ben Collins's avatar Ben Collins

IEEE1394/OHCI(r1131): Suspend/resume isn't dependent on CONFIG_PM.

parent c486d30d
...@@ -3474,13 +3474,11 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) ...@@ -3474,13 +3474,11 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
} }
#ifdef CONFIG_PM
static int ohci1394_pci_resume (struct pci_dev *dev) static int ohci1394_pci_resume (struct pci_dev *dev)
{ {
pci_enable_device(dev); pci_enable_device(dev);
return 0; return 0;
} }
#endif
#define PCI_CLASS_FIREWIRE_OHCI ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10) #define PCI_CLASS_FIREWIRE_OHCI ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10)
...@@ -3504,10 +3502,7 @@ static struct pci_driver ohci1394_pci_driver = { ...@@ -3504,10 +3502,7 @@ static struct pci_driver ohci1394_pci_driver = {
.id_table = ohci1394_pci_tbl, .id_table = ohci1394_pci_tbl,
.probe = ohci1394_pci_probe, .probe = ohci1394_pci_probe,
.remove = ohci1394_pci_remove, .remove = ohci1394_pci_remove,
#ifdef CONFIG_PM
.resume = ohci1394_pci_resume, .resume = ohci1394_pci_resume,
#endif /* PM */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment