diff options
| author |   Tomas Winkler <tomas.winkler@intel.com> | 2014-02-18 14:31:09 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 10:07:02 -0800 |
| commit | e0270addae23aef8401b1150cbca20b8fb373cd0 (patch) | |
| tree | 0f7bf9c3c23f8a09009d183d3f2644ce6de74a8c | |
| parent | mei: me: put pm callbacks under PM_SLEEP ifdef (diff) | |
| download | linux-dev-e0270addae23aef8401b1150cbca20b8fb373cd0.tar.xz linux-dev-e0270addae23aef8401b1150cbca20b8fb373cd0.zip | |
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>
| -rw-r--r-- | drivers/misc/mei/pci-txe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c index af4412cf2456..a5bf39ad3ff1 100644 --- a/drivers/misc/mei/pci-txe.c +++ b/drivers/misc/mei/pci-txe.c @@ -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) { 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) #else #define MEI_TXE_PM_OPS NULL -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */ /* * PCI driver structure */ |