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

Commit 4cda1fd7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge head 'drm-via' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

parents bb6b8238 717cb906

drivers/char/drm/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -96,3 +96,10 @@ config DRM_SIS 
          chipset. If M is selected the module will be called sis. AGP

          support is required for this driver to work.



config DRM_VIA

	tristate "Via unichrome video cards"

	depends on DRM

	help

	  Choose this option if you have a Via unichrome or compatible video

	  chipset. If M is selected the module will be called via.

drivers/char/drm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o 
radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o

ffb-objs    := ffb_drv.o ffb_context.o

sis-objs    := sis_drv.o sis_ds.o sis_mm.o

via-objs    := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o



ifeq ($(CONFIG_COMPAT),y)

drm-objs    += drm_ioc32.o
@@ -35,4 +36,5 @@ obj-$(CONFIG_DRM_I830) += i830.o 
obj-$(CONFIG_DRM_I915)  += i915.o

obj-$(CONFIG_DRM_FFB)   += ffb.o

obj-$(CONFIG_DRM_SIS)   += sis.o

obj-$(CONFIG_DRM_VIA)	+=via.o

drivers/char/drm/drm_pciids.h

+7 −0
Original line number Diff line number Diff line
@@ -223,3 +223,10 @@ 
	{0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0, 0, 0}



#define viadrv_PCI_IDS \

	{0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0x1106, 0x3122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0x1106, 0x7205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0x1106, 0x7204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0, 0, 0}