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

Commit e0228785 authored by Phil Turmel's avatar Phil Turmel Committed by Ben Skeggs
Browse files

drm/nouveau: Fix build regression, undefined reference to `acpi_video_get_edid'



Build breakage:

drivers/built-in.o: In function `nouveau_acpi_edid':
(.text+0x13404e): undefined reference to `acpi_video_get_edid'
make: *** [.tmp_vmlinux1] Error 1

Introduced by:

a6ed76d7 is the first bad commit
commit a6ed76d7
Author: Ben Skeggs <bskeggs@redhat.com>
Date:   Mon Jul 12 15:33:07 2010 +1000

    drm/nouveau: support fetching LVDS EDID from ACPI

    Based on a patch from Matthew Garrett.

    Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
    Acked-by: default avatarMatthew Garrett <mjg@redhat.com>

It doesn't seem to revert cleanly, but the problem lies in these
two config entries:

CONFIG_ACPI=y
CONFIG_ACPI_VIDEO=m

Adding a select for ACPI_VIDEO appears to be the best solution, and
is comparable to what is done in DRM_I915.  Builds, boots, and appears to
work correctly.

Signed-off-by: default avatarPhilip J. Turmel <philip@turmel.org>
Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 64f1c11a
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config DRM_NOUVEAU
	select FB
	select FRAMEBUFFER_CONSOLE if !EMBEDDED
	select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
	select ACPI_VIDEO if ACPI
	help
	  Choose this option for open-source nVidia support.