diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2014-02-18 07:31:09 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 13:07:02 -0500 |
| commit | e0270addae23aef8401b1150cbca20b8fb373cd0 (patch) | |
| tree | 0f7bf9c3c23f8a09009d183d3f2644ce6de74a8c | |
| parent | 16833257a1ee9f7b2c997f0a26f91b1d9055642c (diff) | |
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) | |||
| 209 | } | 209 | } |
| 210 | 210 | ||
| 211 | 211 | ||
| 212 | #ifdef CONFIG_PM | 212 | #ifdef CONFIG_PM_SLEEP |
| 213 | static int mei_txe_pci_suspend(struct device *device) | 213 | static int mei_txe_pci_suspend(struct device *device) |
| 214 | { | 214 | { |
| 215 | struct pci_dev *pdev = to_pci_dev(device); | 215 | struct pci_dev *pdev = to_pci_dev(device); |
| @@ -273,7 +273,7 @@ static SIMPLE_DEV_PM_OPS(mei_txe_pm_ops, | |||
| 273 | #define MEI_TXE_PM_OPS (&mei_txe_pm_ops) | 273 | #define MEI_TXE_PM_OPS (&mei_txe_pm_ops) |
| 274 | #else | 274 | #else |
| 275 | #define MEI_TXE_PM_OPS NULL | 275 | #define MEI_TXE_PM_OPS NULL |
| 276 | #endif /* CONFIG_PM */ | 276 | #endif /* CONFIG_PM_SLEEP */ |
| 277 | /* | 277 | /* |
| 278 | * PCI driver structure | 278 | * PCI driver structure |
| 279 | */ | 279 | */ |
