From: Florian Fainelli Date: Mon, 8 Oct 2012 13:11:27 +0000 (+0200) Subject: USB: ohci: move ohci_pci_{suspend,resume} to ohci-hcd.c X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~82^2~137 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd1965db054eeace344487b9c8560439961f5f55;p=pandora-kernel.git USB: ohci: move ohci_pci_{suspend,resume} to ohci-hcd.c As suggested by Alan Stern, move the ohci-pci.c ohci_pci_{suspend,resume} routines to ohci-hcd.c. Due to their move, also rename them to ohci_{suspend,resume} to make it clear they operate on ohci_hcd. Since they are not necessarily called, annotate them with __maybe_unused, and make them enclosed within an #ifdef CONFIG_PM / #endif section. Signed-off-by: Florian Fainelli Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed