Merge omapdss split between omapdrm and omapfb (caf05780) · Commits · e / devices / android_kernel_teracube_2e

drivers/gpu/drm/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ obj-$(CONFIG_DRM_ARMADA) += armada/
		obj-$(CONFIG_DRM_ATMEL_HLCDC) += atmel-hlcdc/
		obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
		obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
		obj-$(CONFIG_DRM_OMAP) += omapdrm/
		obj-y += omapdrm/
		obj-y += tilcdc/
		obj-$(CONFIG_DRM_QXL) += qxl/
		obj-$(CONFIG_DRM_BOCHS) += bochs/

+7 −3

Original line number	Diff line number	Diff line

		config DRM_OMAP
		tristate "OMAP DRM"
		depends on DRM
		depends on ARCH_OMAP2PLUS \|\| ARCH_MULTIPLATFORM
		depends on OMAP2_DSS
		select OMAP2_DSS
		select DRM_KMS_HELPER
		select DRM_KMS_FB_HELPER
		select FB_SYS_FILLRECT
		@@ -14,13 +13,18 @@ config DRM_OMAP
		help
		DRM display driver for OMAP2/3/4 based boards.

		if DRM_OMAP

		config DRM_OMAP_NUM_CRTCS
		int "Number of CRTCs"
		range 1 10
		default 1 if ARCH_OMAP2 \|\| ARCH_OMAP3
		default 2 if ARCH_OMAP4
		depends on DRM_OMAP
		help
		Select the number of video overlays which can be used as framebuffers.
		The remaining overlays are reserved for video.

		source "drivers/gpu/drm/omapdrm/dss/Kconfig"
		source "drivers/gpu/drm/omapdrm/displays/Kconfig"

		endif

+3 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,9 @@
		# Direct Rendering Infrastructure (DRI)
		#

		obj-y += dss/
		obj-y += displays/

		ccflags-y := -Iinclude/drm -Werror
		omapdrm-y := omap_drv.o \
		omap_irq.o \

+1 −2

Original line number	Diff line number	Diff line
		menu "OMAP Display Device Drivers (new device model)"
		depends on OMAP2_DSS
		menu "OMAPDRM External Display Device Drivers"

		config DISPLAY_ENCODER_OPA362
		tristate "OPA362 external analog amplifier"

+0 −0

File moved.