Subject: CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c From: Alexey Dobriyan Date: Fri, 11 Aug 2006 16:46:14 -0700 Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton --- drivers/ieee1394/ohci1394.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff -puN drivers/ieee1394/ohci1394.c~config_pm=n-slim-drivers-ieee1394-ohci1394c drivers/ieee1394/ohci1394.c --- a/drivers/ieee1394/ohci1394.c~config_pm=n-slim-drivers-ieee1394-ohci1394c +++ a/drivers/ieee1394/ohci1394.c @@ -3530,7 +3530,7 @@ static void ohci1394_pci_remove(struct p 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 return 0; } - +#endif #define PCI_CLASS_FIREWIRE_OHCI ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10) @@ -3591,8 +3591,10 @@ static struct pci_driver ohci1394_pci_dr .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 }; /*********************************** _