diff options
author | Martin Peres <martin.peres@free.fr> | 2011-04-11 18:55:44 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-05-15 20:49:34 -0400 |
commit | 1f962797fb1343f02cbacb94d80c4560d47b67a9 (patch) | |
tree | 7155a67b063bcaf3b74bd799e047a00b87b30e50 /drivers | |
parent | 1233bd8d31902c09f22691294082c7825f71d13b (diff) |
drm/nouveau/pm: fix compilation failure when CONFIG_POWER_SUPPLY is not set
Signed-off-by: Martin Peres <martin.peres@ensi-bourges.fr>
Reported-by: Stratos Psomadakis <psomas@ece.ntua.gr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index 0b1caebc6eee..dc8a0cc8e5dc 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c | |||
@@ -449,7 +449,7 @@ nouveau_hwmon_fini(struct drm_device *dev) | |||
449 | #endif | 449 | #endif |
450 | } | 450 | } |
451 | 451 | ||
452 | #ifdef CONFIG_ACPI | 452 | #if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY) |
453 | static int | 453 | static int |
454 | nouveau_pm_acpi_event(struct notifier_block *nb, unsigned long val, void *data) | 454 | nouveau_pm_acpi_event(struct notifier_block *nb, unsigned long val, void *data) |
455 | { | 455 | { |
@@ -508,7 +508,7 @@ nouveau_pm_init(struct drm_device *dev) | |||
508 | 508 | ||
509 | nouveau_sysfs_init(dev); | 509 | nouveau_sysfs_init(dev); |
510 | nouveau_hwmon_init(dev); | 510 | nouveau_hwmon_init(dev); |
511 | #ifdef CONFIG_ACPI | 511 | #if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY) |
512 | pm->acpi_nb.notifier_call = nouveau_pm_acpi_event; | 512 | pm->acpi_nb.notifier_call = nouveau_pm_acpi_event; |
513 | register_acpi_notifier(&pm->acpi_nb); | 513 | register_acpi_notifier(&pm->acpi_nb); |
514 | #endif | 514 | #endif |
@@ -530,7 +530,7 @@ nouveau_pm_fini(struct drm_device *dev) | |||
530 | nouveau_perf_fini(dev); | 530 | nouveau_perf_fini(dev); |
531 | nouveau_volt_fini(dev); | 531 | nouveau_volt_fini(dev); |
532 | 532 | ||
533 | #ifdef CONFIG_ACPI | 533 | #if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY) |
534 | unregister_acpi_notifier(&pm->acpi_nb); | 534 | unregister_acpi_notifier(&pm->acpi_nb); |
535 | #endif | 535 | #endif |
536 | nouveau_hwmon_fini(dev); | 536 | nouveau_hwmon_fini(dev); |