p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mei: txe: put pm callbacks under PM_SLEEP ifdef 

PCI suspend resume callbacks should be defined
under CONFIG_PM_SLEEP

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tomas Winkler 2014-02-18 14:31:09 +02:00 committed by Greg Kroah-Hartman
parent 16833257a1
commit e0270addae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/mei/pci-txe.c
View File

@ -209,7 +209,7 @@ static void mei_txe_remove(struct pci_dev *pdev)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int mei_txe_pci_suspend(struct device *device) static int mei_txe_pci_suspend(struct device *device)
{ {
struct pci_dev *pdev = to_pci_dev(device); struct pci_dev *pdev = to_pci_dev(device);
@ -273,7 +273,7 @@ static SIMPLE_DEV_PM_OPS(mei_txe_pm_ops,
#define MEI_TXE_PM_OPS (&mei_txe_pm_ops) #define MEI_TXE_PM_OPS (&mei_txe_pm_ops)
#else #else
#define MEI_TXE_PM_OPS NULL #define MEI_TXE_PM_OPS NULL
#endif /* CONFIG_PM */ #endif /* CONFIG_PM_SLEEP */
/* /*
* PCI driver structure * PCI driver structure
*/ */