[PATCH] drm/nouveau: Remove no longer needed local ACPI_VIDEO_NOTIFY_PROBE define

Hans de Goede hdegoede at redhat.com
Fri May 26 07:35:08 UTC 2017


The local #define of ACPI_VIDEO_NOTIFY_PROBE was only added temporarily
to avoid a dependency between the acpi and nouveau trees while merging.

This is now properly defined in acpi/video.h and the local #define can
be dropped.

Signed-off-by: Hans de Goede <hdegoede at redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_display.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 549763f5e17d..70de2079b2cc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -369,15 +369,6 @@ nouveau_display_hpd_work(struct work_struct *work)
 
 #ifdef CONFIG_ACPI
 
-/*
- * Hans de Goede: This define belongs in acpi/video.h, I've submitted a patch
- * to the acpi subsys to move it there from drivers/acpi/acpi_video.c .
- * This should be dropped once that is merged.
- */
-#ifndef ACPI_VIDEO_NOTIFY_PROBE
-#define ACPI_VIDEO_NOTIFY_PROBE			0x81
-#endif
-
 static int
 nouveau_display_acpi_ntfy(struct notifier_block *nb, unsigned long val,
 			  void *data)
-- 
2.13.0



More information about the dri-devel mailing list