diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-20 15:42:03 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-20 15:42:03 -0500 |
| commit | 5e2e46e84b6f77d4f8e51d6e33ff8eb0f47288f2 (patch) | |
| tree | e7b40c95f8216156a9d169aecd8759ccd6da0009 /drivers/acpi/fan.c | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
| parent | fae9e2a4b1c59d11edfa7c99c34293bf9fbf2bde (diff) | |
Merge branch 'acpi-pm' into acpi-fan
Diffstat (limited to 'drivers/acpi/fan.c')
| -rw-r--r-- | drivers/acpi/fan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 1fb62900f32a..09e423f3d8ad 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c | |||
| @@ -55,6 +55,9 @@ MODULE_DEVICE_TABLE(acpi, fan_device_ids); | |||
| 55 | #ifdef CONFIG_PM_SLEEP | 55 | #ifdef CONFIG_PM_SLEEP |
| 56 | static int acpi_fan_suspend(struct device *dev); | 56 | static int acpi_fan_suspend(struct device *dev); |
| 57 | static int acpi_fan_resume(struct device *dev); | 57 | static int acpi_fan_resume(struct device *dev); |
| 58 | #else | ||
| 59 | #define acpi_fan_suspend NULL | ||
| 60 | #define acpi_fan_resume NULL | ||
| 58 | #endif | 61 | #endif |
| 59 | static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume); | 62 | static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume); |
| 60 | 63 | ||