Commit 1f962797 authored by Martin Peres's avatar Martin Peres Committed by Ben Skeggs

drm/nouveau/pm: fix compilation failure when CONFIG_POWER_SUPPLY is not set

Signed-off-by: default avatarMartin Peres <martin.peres@ensi-bourges.fr>
Reported-by: default avatarStratos Psomadakis <psomas@ece.ntua.gr>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 1233bd8d
...@@ -449,7 +449,7 @@ nouveau_hwmon_fini(struct drm_device *dev) ...@@ -449,7 +449,7 @@ nouveau_hwmon_fini(struct drm_device *dev)
#endif #endif
} }
#ifdef CONFIG_ACPI #if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY)
static int static int
nouveau_pm_acpi_event(struct notifier_block *nb, unsigned long val, void *data) nouveau_pm_acpi_event(struct notifier_block *nb, unsigned long val, void *data)
{ {
...@@ -508,7 +508,7 @@ nouveau_pm_init(struct drm_device *dev) ...@@ -508,7 +508,7 @@ nouveau_pm_init(struct drm_device *dev)
nouveau_sysfs_init(dev); nouveau_sysfs_init(dev);
nouveau_hwmon_init(dev); nouveau_hwmon_init(dev);
#ifdef CONFIG_ACPI #if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY)
pm->acpi_nb.notifier_call = nouveau_pm_acpi_event; pm->acpi_nb.notifier_call = nouveau_pm_acpi_event;
register_acpi_notifier(&pm->acpi_nb); register_acpi_notifier(&pm->acpi_nb);
#endif #endif
...@@ -530,7 +530,7 @@ nouveau_pm_fini(struct drm_device *dev) ...@@ -530,7 +530,7 @@ nouveau_pm_fini(struct drm_device *dev)
nouveau_perf_fini(dev); nouveau_perf_fini(dev);
nouveau_volt_fini(dev); nouveau_volt_fini(dev);
#ifdef CONFIG_ACPI #if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY)
unregister_acpi_notifier(&pm->acpi_nb); unregister_acpi_notifier(&pm->acpi_nb);
#endif #endif
nouveau_hwmon_fini(dev); nouveau_hwmon_fini(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment