diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-20 02:25:07 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-20 02:25:07 +0000 |
| commit | 031f431679b03ba7e791dd051fc13f51f806fcd7 (patch) | |
| tree | 9018f8a4a6c04feaf0180cae915dfe804913ce34 /arch/x86/platform/olpc/olpc-xo15-sci.c | |
| parent | f7901365aa48b20b25f8402e0fd1eea4ac6c55e7 (diff) | |
| parent | 91db57e54eb9be1560454d6a370d67847b05735f (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rtlsk-v4.4-18.03-rt
Diffstat (limited to 'arch/x86/platform/olpc/olpc-xo15-sci.c')
| -rw-r--r-- | arch/x86/platform/olpc/olpc-xo15-sci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c index 55130846ac87..c0533fbc39e3 100644 --- a/arch/x86/platform/olpc/olpc-xo15-sci.c +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c @@ -196,6 +196,7 @@ static int xo15_sci_remove(struct acpi_device *device) return 0; } +#ifdef CONFIG_PM_SLEEP static int xo15_sci_resume(struct device *dev) { /* Enable all EC events */ @@ -207,6 +208,7 @@ static int xo15_sci_resume(struct device *dev) return 0; } +#endif static SIMPLE_DEV_PM_OPS(xo15_sci_pm, NULL, xo15_sci_resume); |