From 27798294c08b6067338a6e36787c22b00af6c3f9 Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Tue, 12 Apr 2011 00:55:44 +0200 Subject: [PATCH] --- yaml --- r: 250669 b: refs/heads/master c: 1f962797fb1343f02cbacb94d80c4560d47b67a9 h: refs/heads/master i: 250667: dea33244d5006c9d4b8b7e4189d3dcf1d9f8a5d6 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_pm.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1d847e4e3413..72e44794cf6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1233bd8d31902c09f22691294082c7825f71d13b +refs/heads/master: 1f962797fb1343f02cbacb94d80c4560d47b67a9 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c b/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c index 0b1caebc6eee..dc8a0cc8e5dc 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c @@ -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);