Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/nouveau/nouveau_pm.c

+3 −3
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ nouveau_hwmon_fini(struct drm_device *dev) 
#endif

}



#ifdef CONFIG_ACPI

#if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY)

static int

nouveau_pm_acpi_event(struct notifier_block *nb, unsigned long val, void *data)

{
@@ -508,7 +508,7 @@ nouveau_pm_init(struct drm_device *dev) 


	nouveau_sysfs_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;

	register_acpi_notifier(&pm->acpi_nb);

#endif
@@ -530,7 +530,7 @@ nouveau_pm_fini(struct drm_device *dev) 
	nouveau_perf_fini(dev);

	nouveau_volt_fini(dev);



#ifdef CONFIG_ACPI

#if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY)

	unregister_acpi_notifier(&pm->acpi_nb);

#endif

	nouveau_hwmon_fini(dev);