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

Commit 31db5645 authored by Len Brown's avatar Len Brown
Browse files

ACPI, i915: build fix (v2) 



drivers/built-in.o: In function `intel_opregion_init':
(.text+0x9d540): undefined reference to `acpi_video_register'

v2: move under DRM_I915 from DRM_I915_KMS

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
parent 61c8c67e

drivers/gpu/drm/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -67,12 +67,18 @@ config DRM_I830 
	  will load the correct one.



config DRM_I915

	tristate "i915 driver"

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select FB

	select FRAMEBUFFER_CONSOLE if !EMBEDDED

	tristate "i915 driver"

	# i915 depends on ACPI_VIDEO when ACPI is enabled

	# but for select to work, need to select ACPI_VIDEO's dependencies, ick

	select VIDEO_OUTPUT_CONTROL if ACPI

	select BACKLIGHT_CLASS_DEVICE if ACPI

	select INPUT if ACPI

	select ACPI_VIDEO if ACPI

	help

	  Choose this option if you have a system that has Intel 830M, 845G,

	  852GM, 855GM 865G or 915G integrated graphics.  If M is selected, the
@@ -84,12 +90,6 @@ config DRM_I915 
config DRM_I915_KMS

	bool "Enable modesetting on intel by default"

	depends on DRM_I915

	# i915 KMS depends on ACPI_VIDEO when ACPI is enabled

	# but for select to work, need to select ACPI_VIDEO's dependencies, ick

	select VIDEO_OUTPUT_CONTROL if ACPI

	select BACKLIGHT_CLASS_DEVICE if ACPI

	select INPUT if ACPI

	select ACPI_VIDEO if ACPI

	help

	  Choose this option if you want kernel modesetting enabled by default,

	  and you have a new enough userspace to support this. Running old