diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 13:32:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 13:32:24 -0700 |
commit | c142bda458a9c81097238800e1bd8eeeea09913d (patch) | |
tree | a412321f62cbb90cae831d7f2dea026cbd3c958c | |
parent | b5cf43c47b05c8deb10f9674d541dddbdec0e341 (diff) | |
parent | c0e09200dc0813972442e550a5905a132768e56c (diff) |
Merge branch 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: reorganise drm tree to be more future proof.
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/char/Makefile | 1 | ||||
-rw-r--r-- | drivers/char/drm/Makefile | 40 | ||||
-rw-r--r-- | drivers/gpu/Makefile | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/Kconfig (renamed from drivers/char/drm/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/Makefile | 26 | ||||
-rw-r--r-- | drivers/gpu/drm/README.drm (renamed from drivers/char/drm/README.drm) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/ati_pcigart.c (renamed from drivers/char/drm/ati_pcigart.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_agpsupport.c (renamed from drivers/char/drm/drm_agpsupport.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_auth.c (renamed from drivers/char/drm/drm_auth.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_bufs.c (renamed from drivers/char/drm/drm_bufs.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_context.c (renamed from drivers/char/drm/drm_context.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_dma.c (renamed from drivers/char/drm/drm_dma.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_drawable.c (renamed from drivers/char/drm/drm_drawable.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_drv.c (renamed from drivers/char/drm/drm_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_fops.c (renamed from drivers/char/drm/drm_fops.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_hashtab.c (renamed from drivers/char/drm/drm_hashtab.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_ioc32.c (renamed from drivers/char/drm/drm_ioc32.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_ioctl.c (renamed from drivers/char/drm/drm_ioctl.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_irq.c (renamed from drivers/char/drm/drm_irq.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_lock.c (renamed from drivers/char/drm/drm_lock.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_memory.c (renamed from drivers/char/drm/drm_memory.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_mm.c (renamed from drivers/char/drm/drm_mm.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_pci.c (renamed from drivers/char/drm/drm_pci.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_proc.c (renamed from drivers/char/drm/drm_proc.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_scatter.c (renamed from drivers/char/drm/drm_scatter.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_sman.c (renamed from drivers/char/drm/drm_sman.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_stub.c (renamed from drivers/char/drm/drm_stub.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_sysfs.c (renamed from drivers/char/drm/drm_sysfs.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_vm.c (renamed from drivers/char/drm/drm_vm.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i810/Makefile | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/i810/i810_dma.c (renamed from drivers/char/drm/i810_dma.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i810/i810_drv.c (renamed from drivers/char/drm/i810_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i810/i810_drv.h (renamed from drivers/char/drm/i810_drv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i830/Makefile | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/i830/i830_dma.c (renamed from drivers/char/drm/i830_dma.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i830/i830_drv.c (renamed from drivers/char/drm/i830_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i830/i830_drv.h (renamed from drivers/char/drm/i830_drv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i830/i830_irq.c (renamed from drivers/char/drm/i830_irq.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/Makefile | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c (renamed from drivers/char/drm/i915_dma.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c (renamed from drivers/char/drm/i915_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h (renamed from drivers/char/drm/i915_drv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_ioc32.c (renamed from drivers/char/drm/i915_ioc32.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c (renamed from drivers/char/drm/i915_irq.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_mem.c (renamed from drivers/char/drm/i915_mem.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/mga/Makefile | 11 | ||||
-rw-r--r-- | drivers/gpu/drm/mga/mga_dma.c (renamed from drivers/char/drm/mga_dma.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/mga/mga_drv.c (renamed from drivers/char/drm/mga_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/mga/mga_drv.h (renamed from drivers/char/drm/mga_drv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/mga/mga_ioc32.c (renamed from drivers/char/drm/mga_ioc32.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/mga/mga_irq.c (renamed from drivers/char/drm/mga_irq.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/mga/mga_state.c (renamed from drivers/char/drm/mga_state.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/mga/mga_ucode.h (renamed from drivers/char/drm/mga_ucode.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/mga/mga_warp.c (renamed from drivers/char/drm/mga_warp.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/Makefile | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/r128_cce.c (renamed from drivers/char/drm/r128_cce.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/r128_drv.c (renamed from drivers/char/drm/r128_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/r128_drv.h (renamed from drivers/char/drm/r128_drv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/r128_ioc32.c (renamed from drivers/char/drm/r128_ioc32.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/r128_irq.c (renamed from drivers/char/drm/r128_irq.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/r128_state.c (renamed from drivers/char/drm/r128_state.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/Makefile | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/r300_cmdbuf.c (renamed from drivers/char/drm/r300_cmdbuf.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/r300_reg.h (renamed from drivers/char/drm/r300_reg.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_cp.c (renamed from drivers/char/drm/radeon_cp.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c (renamed from drivers/char/drm/radeon_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.h (renamed from drivers/char/drm/radeon_drv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ioc32.c (renamed from drivers/char/drm/radeon_ioc32.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_irq.c (renamed from drivers/char/drm/radeon_irq.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_mem.c (renamed from drivers/char/drm/radeon_mem.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_microcode.h (renamed from drivers/char/drm/radeon_microcode.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_state.c (renamed from drivers/char/drm/radeon_state.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/savage/Makefile | 9 | ||||
-rw-r--r-- | drivers/gpu/drm/savage/savage_bci.c (renamed from drivers/char/drm/savage_bci.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/savage/savage_drv.c (renamed from drivers/char/drm/savage_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/savage/savage_drv.h (renamed from drivers/char/drm/savage_drv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/savage/savage_state.c (renamed from drivers/char/drm/savage_state.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/sis/Makefile | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/sis/sis_drv.c (renamed from drivers/char/drm/sis_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/sis/sis_drv.h (renamed from drivers/char/drm/sis_drv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/sis/sis_mm.c (renamed from drivers/char/drm/sis_mm.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/tdfx/Makefile | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/tdfx/tdfx_drv.c (renamed from drivers/char/drm/tdfx_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/tdfx/tdfx_drv.h (renamed from drivers/char/drm/tdfx_drv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/Makefile | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_3d_reg.h (renamed from drivers/char/drm/via_3d_reg.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_dma.c (renamed from drivers/char/drm/via_dma.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_dmablit.c (renamed from drivers/char/drm/via_dmablit.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_dmablit.h (renamed from drivers/char/drm/via_dmablit.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_drv.c (renamed from drivers/char/drm/via_drv.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_drv.h (renamed from drivers/char/drm/via_drv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_irq.c (renamed from drivers/char/drm/via_irq.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_map.c (renamed from drivers/char/drm/via_map.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_mm.c (renamed from drivers/char/drm/via_mm.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_verifier.c (renamed from drivers/char/drm/via_verifier.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_verifier.h (renamed from drivers/char/drm/via_verifier.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/via/via_video.c (renamed from drivers/char/drm/via_video.c) | 0 | ||||
-rw-r--r-- | drivers/video/Kconfig | 2 | ||||
-rw-r--r-- | include/Kbuild | 1 | ||||
-rw-r--r-- | include/drm/Kbuild | 10 | ||||
-rw-r--r-- | include/drm/drm.h (renamed from drivers/char/drm/drm.h) | 0 | ||||
-rw-r--r-- | include/drm/drmP.h (renamed from drivers/char/drm/drmP.h) | 0 | ||||
-rw-r--r-- | include/drm/drm_core.h (renamed from drivers/char/drm/drm_core.h) | 0 | ||||
-rw-r--r-- | include/drm/drm_hashtab.h (renamed from drivers/char/drm/drm_hashtab.h) | 0 | ||||
-rw-r--r-- | include/drm/drm_memory.h (renamed from drivers/char/drm/drm_memory.h) | 0 | ||||
-rw-r--r-- | include/drm/drm_memory_debug.h (renamed from drivers/char/drm/drm_memory_debug.h) | 0 | ||||
-rw-r--r-- | include/drm/drm_os_linux.h (renamed from drivers/char/drm/drm_os_linux.h) | 0 | ||||
-rw-r--r-- | include/drm/drm_pciids.h (renamed from drivers/char/drm/drm_pciids.h) | 0 | ||||
-rw-r--r-- | include/drm/drm_sarea.h (renamed from drivers/char/drm/drm_sarea.h) | 0 | ||||
-rw-r--r-- | include/drm/drm_sman.h (renamed from drivers/char/drm/drm_sman.h) | 0 | ||||
-rw-r--r-- | include/drm/i810_drm.h (renamed from drivers/char/drm/i810_drm.h) | 0 | ||||
-rw-r--r-- | include/drm/i830_drm.h (renamed from drivers/char/drm/i830_drm.h) | 0 | ||||
-rw-r--r-- | include/drm/i915_drm.h (renamed from drivers/char/drm/i915_drm.h) | 0 | ||||
-rw-r--r-- | include/drm/mga_drm.h (renamed from drivers/char/drm/mga_drm.h) | 0 | ||||
-rw-r--r-- | include/drm/r128_drm.h (renamed from drivers/char/drm/r128_drm.h) | 0 | ||||
-rw-r--r-- | include/drm/radeon_drm.h (renamed from drivers/char/drm/radeon_drm.h) | 0 | ||||
-rw-r--r-- | include/drm/savage_drm.h (renamed from drivers/char/drm/savage_drm.h) | 0 | ||||
-rw-r--r-- | include/drm/sis_drm.h (renamed from drivers/char/drm/sis_drm.h) | 0 | ||||
-rw-r--r-- | include/drm/via_drm.h (renamed from drivers/char/drm/via_drm.h) | 0 |
120 files changed, 132 insertions, 42 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index f65deda72d61..fda44679dffc 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_PARISC) += parisc/ obj-$(CONFIG_RAPIDIO) += rapidio/ obj-y += video/ +obj-y += gpu/ obj-$(CONFIG_ACPI) += acpi/ # PnP must come after ACPI since it will eventually need to check if acpi # was used and do nothing if so diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 4c1c584e9eb6..81630a68475c 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -101,7 +101,6 @@ obj-$(CONFIG_TELCLOCK) += tlclk.o obj-$(CONFIG_MWAVE) += mwave/ obj-$(CONFIG_AGP) += agp/ -obj-$(CONFIG_DRM) += drm/ obj-$(CONFIG_PCMCIA) += pcmcia/ obj-$(CONFIG_IPMI_HANDLER) += ipmi/ diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile deleted file mode 100644 index 1283ded88ead..000000000000 --- a/drivers/char/drm/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# Makefile for the drm device driver. This driver provides support for the -# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. - -drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \ - drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \ - drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \ - drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \ - drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o - -tdfx-objs := tdfx_drv.o -r128-objs := r128_drv.o r128_cce.o r128_state.o r128_irq.o -mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o -i810-objs := i810_drv.o i810_dma.o -i830-objs := i830_drv.o i830_dma.o i830_irq.o -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 r300_cmdbuf.o -sis-objs := sis_drv.o sis_mm.o -savage-objs := savage_drv.o savage_bci.o savage_state.o -via-objs := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o - -ifeq ($(CONFIG_COMPAT),y) -drm-objs += drm_ioc32.o -radeon-objs += radeon_ioc32.o -mga-objs += mga_ioc32.o -r128-objs += r128_ioc32.o -i915-objs += i915_ioc32.o -endif - -obj-$(CONFIG_DRM) += drm.o -obj-$(CONFIG_DRM_TDFX) += tdfx.o -obj-$(CONFIG_DRM_R128) += r128.o -obj-$(CONFIG_DRM_RADEON)+= radeon.o -obj-$(CONFIG_DRM_MGA) += mga.o -obj-$(CONFIG_DRM_I810) += i810.o -obj-$(CONFIG_DRM_I830) += i830.o -obj-$(CONFIG_DRM_I915) += i915.o -obj-$(CONFIG_DRM_SIS) += sis.o -obj-$(CONFIG_DRM_SAVAGE)+= savage.o -obj-$(CONFIG_DRM_VIA) +=via.o diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile new file mode 100644 index 000000000000..de566cf0414c --- /dev/null +++ b/drivers/gpu/Makefile @@ -0,0 +1 @@ +obj-y += drm/ diff --git a/drivers/char/drm/Kconfig b/drivers/gpu/drm/Kconfig index 610d6fd5bb50..610d6fd5bb50 100644 --- a/drivers/char/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile new file mode 100644 index 000000000000..e9f9a97ae00a --- /dev/null +++ b/drivers/gpu/drm/Makefile @@ -0,0 +1,26 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm + +drm-y := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \ + drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \ + drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \ + drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \ + drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o + +drm-$(CONFIG_COMPAT) += drm_ioc32.o + +obj-$(CONFIG_DRM) += drm.o +obj-$(CONFIG_DRM_TDFX) += tdfx/ +obj-$(CONFIG_DRM_R128) += r128/ +obj-$(CONFIG_DRM_RADEON)+= radeon/ +obj-$(CONFIG_DRM_MGA) += mga/ +obj-$(CONFIG_DRM_I810) += i810/ +obj-$(CONFIG_DRM_I830) += i830/ +obj-$(CONFIG_DRM_I915) += i915/ +obj-$(CONFIG_DRM_SIS) += sis/ +obj-$(CONFIG_DRM_SAVAGE)+= savage/ +obj-$(CONFIG_DRM_VIA) +=via/ + diff --git a/drivers/char/drm/README.drm b/drivers/gpu/drm/README.drm index b5b332722581..b5b332722581 100644 --- a/drivers/char/drm/README.drm +++ b/drivers/gpu/drm/README.drm diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c index c533d0c9ec61..c533d0c9ec61 100644 --- a/drivers/char/drm/ati_pcigart.c +++ b/drivers/gpu/drm/ati_pcigart.c diff --git a/drivers/char/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c index aefa5ac4c0b1..aefa5ac4c0b1 100644 --- a/drivers/char/drm/drm_agpsupport.c +++ b/drivers/gpu/drm/drm_agpsupport.c diff --git a/drivers/char/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index a73462723d2d..a73462723d2d 100644 --- a/drivers/char/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c diff --git a/drivers/char/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index bde64b84166e..bde64b84166e 100644 --- a/drivers/char/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c diff --git a/drivers/char/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index d505f695421f..d505f695421f 100644 --- a/drivers/char/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c diff --git a/drivers/char/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c index 7a8e2fba4678..7a8e2fba4678 100644 --- a/drivers/char/drm/drm_dma.c +++ b/drivers/gpu/drm/drm_dma.c diff --git a/drivers/char/drm/drm_drawable.c b/drivers/gpu/drm/drm_drawable.c index 1839c57663c5..1839c57663c5 100644 --- a/drivers/char/drm/drm_drawable.c +++ b/drivers/gpu/drm/drm_drawable.c diff --git a/drivers/char/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 564138714bb5..564138714bb5 100644 --- a/drivers/char/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c diff --git a/drivers/char/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index d2e6da85f58a..d2e6da85f58a 100644 --- a/drivers/char/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c diff --git a/drivers/char/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c index 33160673a7b7..33160673a7b7 100644 --- a/drivers/char/drm/drm_hashtab.c +++ b/drivers/gpu/drm/drm_hashtab.c diff --git a/drivers/char/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 90f5a8d9bdcb..90f5a8d9bdcb 100644 --- a/drivers/char/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 16829fb3089d..16829fb3089d 100644 --- a/drivers/char/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c diff --git a/drivers/char/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 089c015c01d1..089c015c01d1 100644 --- a/drivers/char/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c diff --git a/drivers/char/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 0998723cde79..0998723cde79 100644 --- a/drivers/char/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c diff --git a/drivers/char/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c index 845081b44f63..845081b44f63 100644 --- a/drivers/char/drm/drm_memory.c +++ b/drivers/gpu/drm/drm_memory.c diff --git a/drivers/char/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index dcff9e9b52e3..dcff9e9b52e3 100644 --- a/drivers/char/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c diff --git a/drivers/char/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index b55d5bc6ea61..b55d5bc6ea61 100644 --- a/drivers/char/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c diff --git a/drivers/char/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c index 93b1e0475c93..93b1e0475c93 100644 --- a/drivers/char/drm/drm_proc.c +++ b/drivers/gpu/drm/drm_proc.c diff --git a/drivers/char/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c index b2b0f3d41714..b2b0f3d41714 100644 --- a/drivers/char/drm/drm_scatter.c +++ b/drivers/gpu/drm/drm_scatter.c diff --git a/drivers/char/drm/drm_sman.c b/drivers/gpu/drm/drm_sman.c index 926f146390ce..926f146390ce 100644 --- a/drivers/char/drm/drm_sman.c +++ b/drivers/gpu/drm/drm_sman.c diff --git a/drivers/char/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index c2f584f3b46c..c2f584f3b46c 100644 --- a/drivers/char/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index af211a0ef179..af211a0ef179 100644 --- a/drivers/char/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c diff --git a/drivers/char/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index c234c6f24a8d..c234c6f24a8d 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c diff --git a/drivers/gpu/drm/i810/Makefile b/drivers/gpu/drm/i810/Makefile new file mode 100644 index 000000000000..43844ecafcc5 --- /dev/null +++ b/drivers/gpu/drm/i810/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm +i810-y := i810_drv.o i810_dma.o + +obj-$(CONFIG_DRM_I810) += i810.o diff --git a/drivers/char/drm/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index e5de8ea41544..e5de8ea41544 100644 --- a/drivers/char/drm/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c diff --git a/drivers/char/drm/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c index fabb9a817966..fabb9a817966 100644 --- a/drivers/char/drm/i810_drv.c +++ b/drivers/gpu/drm/i810/i810_drv.c diff --git a/drivers/char/drm/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h index 0118849a5672..0118849a5672 100644 --- a/drivers/char/drm/i810_drv.h +++ b/drivers/gpu/drm/i810/i810_drv.h diff --git a/drivers/gpu/drm/i830/Makefile b/drivers/gpu/drm/i830/Makefile new file mode 100644 index 000000000000..c642ee0b238c --- /dev/null +++ b/drivers/gpu/drm/i830/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm +i830-y := i830_drv.o i830_dma.o i830_irq.o + +obj-$(CONFIG_DRM_I830) += i830.o diff --git a/drivers/char/drm/i830_dma.c b/drivers/gpu/drm/i830/i830_dma.c index a86ab30b4620..a86ab30b4620 100644 --- a/drivers/char/drm/i830_dma.c +++ b/drivers/gpu/drm/i830/i830_dma.c diff --git a/drivers/char/drm/i830_drv.c b/drivers/gpu/drm/i830/i830_drv.c index 389597e4a623..389597e4a623 100644 --- a/drivers/char/drm/i830_drv.c +++ b/drivers/gpu/drm/i830/i830_drv.c diff --git a/drivers/char/drm/i830_drv.h b/drivers/gpu/drm/i830/i830_drv.h index b5bf8cc0fdaa..b5bf8cc0fdaa 100644 --- a/drivers/char/drm/i830_drv.h +++ b/drivers/gpu/drm/i830/i830_drv.h diff --git a/drivers/char/drm/i830_irq.c b/drivers/gpu/drm/i830/i830_irq.c index 91ec2bb497e9..91ec2bb497e9 100644 --- a/drivers/char/drm/i830_irq.c +++ b/drivers/gpu/drm/i830/i830_irq.c diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile new file mode 100644 index 000000000000..a9e60464df74 --- /dev/null +++ b/drivers/gpu/drm/i915/Makefile @@ -0,0 +1,10 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm +i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o + +i915-$(CONFIG_COMPAT) += i915_ioc32.o + +obj-$(CONFIG_DRM_I915) += i915.o diff --git a/drivers/char/drm/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 88974342933c..88974342933c 100644 --- a/drivers/char/drm/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c diff --git a/drivers/char/drm/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 93aed1c38bd2..93aed1c38bd2 100644 --- a/drivers/char/drm/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c diff --git a/drivers/char/drm/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d7326d92a237..d7326d92a237 100644 --- a/drivers/char/drm/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h diff --git a/drivers/char/drm/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c index 1fe68a251b75..1fe68a251b75 100644 --- a/drivers/char/drm/i915_ioc32.c +++ b/drivers/gpu/drm/i915/i915_ioc32.c diff --git a/drivers/char/drm/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index df036118b8b1..df036118b8b1 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c diff --git a/drivers/char/drm/i915_mem.c b/drivers/gpu/drm/i915/i915_mem.c index 6126a60dc9cb..6126a60dc9cb 100644 --- a/drivers/char/drm/i915_mem.c +++ b/drivers/gpu/drm/i915/i915_mem.c diff --git a/drivers/gpu/drm/mga/Makefile b/drivers/gpu/drm/mga/Makefile new file mode 100644 index 000000000000..60684785c203 --- /dev/null +++ b/drivers/gpu/drm/mga/Makefile @@ -0,0 +1,11 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm +mga-y := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o + +mga-$(CONFIG_COMPAT) += mga_ioc32.o + +obj-$(CONFIG_DRM_MGA) += mga.o + diff --git a/drivers/char/drm/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c index c1d12dbfa8d8..c1d12dbfa8d8 100644 --- a/drivers/char/drm/mga_dma.c +++ b/drivers/gpu/drm/mga/mga_dma.c diff --git a/drivers/char/drm/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c index 5572939fc7d1..5572939fc7d1 100644 --- a/drivers/char/drm/mga_drv.c +++ b/drivers/gpu/drm/mga/mga_drv.c diff --git a/drivers/char/drm/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h index f6ebd24bd587..f6ebd24bd587 100644 --- a/drivers/char/drm/mga_drv.h +++ b/drivers/gpu/drm/mga/mga_drv.h diff --git a/drivers/char/drm/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c index 30d00478ddee..30d00478ddee 100644 --- a/drivers/char/drm/mga_ioc32.c +++ b/drivers/gpu/drm/mga/mga_ioc32.c diff --git a/drivers/char/drm/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c index 9302cb8f0f83..9302cb8f0f83 100644 --- a/drivers/char/drm/mga_irq.c +++ b/drivers/gpu/drm/mga/mga_irq.c diff --git a/drivers/char/drm/mga_state.c b/drivers/gpu/drm/mga/mga_state.c index d3f8aade07b3..d3f8aade07b3 100644 --- a/drivers/char/drm/mga_state.c +++ b/drivers/gpu/drm/mga/mga_state.c diff --git a/drivers/char/drm/mga_ucode.h b/drivers/gpu/drm/mga/mga_ucode.h index b611e27470e1..b611e27470e1 100644 --- a/drivers/char/drm/mga_ucode.h +++ b/drivers/gpu/drm/mga/mga_ucode.h diff --git a/drivers/char/drm/mga_warp.c b/drivers/gpu/drm/mga/mga_warp.c index 651b93c8ab5d..651b93c8ab5d 100644 --- a/drivers/char/drm/mga_warp.c +++ b/drivers/gpu/drm/mga/mga_warp.c diff --git a/drivers/gpu/drm/r128/Makefile b/drivers/gpu/drm/r128/Makefile new file mode 100644 index 000000000000..1cc72ae3a880 --- /dev/null +++ b/drivers/gpu/drm/r128/Makefile @@ -0,0 +1,10 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm +r128-y := r128_drv.o r128_cce.o r128_state.o r128_irq.o + +r128-$(CONFIG_COMPAT) += r128_ioc32.o + +obj-$(CONFIG_DRM_R128) += r128.o diff --git a/drivers/char/drm/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c index c31afbde62e7..c31afbde62e7 100644 --- a/drivers/char/drm/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c diff --git a/drivers/char/drm/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c index 6108e7587e12..6108e7587e12 100644 --- a/drivers/char/drm/r128_drv.c +++ b/drivers/gpu/drm/r128/r128_drv.c diff --git a/drivers/char/drm/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h index 011105e51ac6..011105e51ac6 100644 --- a/drivers/char/drm/r128_drv.h +++ b/drivers/gpu/drm/r128/r128_drv.h diff --git a/drivers/char/drm/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c index d3cb676eee84..d3cb676eee84 100644 --- a/drivers/char/drm/r128_ioc32.c +++ b/drivers/gpu/drm/r128/r128_ioc32.c diff --git a/drivers/char/drm/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c index c76fdca7662d..c76fdca7662d 100644 --- a/drivers/char/drm/r128_irq.c +++ b/drivers/gpu/drm/r128/r128_irq.c diff --git a/drivers/char/drm/r128_state.c b/drivers/gpu/drm/r128/r128_state.c index 51a9afce7b9b..51a9afce7b9b 100644 --- a/drivers/char/drm/r128_state.c +++ b/drivers/gpu/drm/r128/r128_state.c diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile new file mode 100644 index 000000000000..feb521ebc393 --- /dev/null +++ b/drivers/gpu/drm/radeon/Makefile @@ -0,0 +1,10 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm +radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o + +radeon-$(CONFIG_COMPAT) += radeon_ioc32.o + +obj-$(CONFIG_DRM_RADEON)+= radeon.o diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c index 702df45320f7..702df45320f7 100644 --- a/drivers/char/drm/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c diff --git a/drivers/char/drm/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h index a6802f26afc4..a6802f26afc4 100644 --- a/drivers/char/drm/r300_reg.h +++ b/drivers/gpu/drm/radeon/r300_reg.h diff --git a/drivers/char/drm/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index e53158f0ecb5..e53158f0ecb5 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c diff --git a/drivers/char/drm/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 349ac3d3b848..349ac3d3b848 100644 --- a/drivers/char/drm/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c diff --git a/drivers/char/drm/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 3f0eca957aa7..3f0eca957aa7 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h diff --git a/drivers/char/drm/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c index 56decda2a71f..56decda2a71f 100644 --- a/drivers/char/drm/radeon_ioc32.c +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c diff --git a/drivers/char/drm/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c index ee40d197deb7..ee40d197deb7 100644 --- a/drivers/char/drm/radeon_irq.c +++ b/drivers/gpu/drm/radeon/radeon_irq.c diff --git a/drivers/char/drm/radeon_mem.c b/drivers/gpu/drm/radeon/radeon_mem.c index 4af5286a36fb..4af5286a36fb 100644 --- a/drivers/char/drm/radeon_mem.c +++ b/drivers/gpu/drm/radeon/radeon_mem.c diff --git a/drivers/char/drm/radeon_microcode.h b/drivers/gpu/drm/radeon/radeon_microcode.h index a348c9e7db1c..a348c9e7db1c 100644 --- a/drivers/char/drm/radeon_microcode.h +++ b/drivers/gpu/drm/radeon/radeon_microcode.h diff --git a/drivers/char/drm/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c index 11c146b49211..11c146b49211 100644 --- a/drivers/char/drm/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c diff --git a/drivers/gpu/drm/savage/Makefile b/drivers/gpu/drm/savage/Makefile new file mode 100644 index 000000000000..d8f84ac7bb26 --- /dev/null +++ b/drivers/gpu/drm/savage/Makefile @@ -0,0 +1,9 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y = -Iinclude/drm +savage-y := savage_drv.o savage_bci.o savage_state.o + +obj-$(CONFIG_DRM_SAVAGE)+= savage.o + diff --git a/drivers/char/drm/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c index d465b2f9c1cd..d465b2f9c1cd 100644 --- a/drivers/char/drm/savage_bci.c +++ b/drivers/gpu/drm/savage/savage_bci.c diff --git a/drivers/char/drm/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c index eee52aa92a7c..eee52aa92a7c 100644 --- a/drivers/char/drm/savage_drv.c +++ b/drivers/gpu/drm/savage/savage_drv.c diff --git a/drivers/char/drm/savage_drv.h b/drivers/gpu/drm/savage/savage_drv.h index df2aac6636f7..df2aac6636f7 100644 --- a/drivers/char/drm/savage_drv.h +++ b/drivers/gpu/drm/savage/savage_drv.h diff --git a/drivers/char/drm/savage_state.c b/drivers/gpu/drm/savage/savage_state.c index 5f6238fdf1fa..5f6238fdf1fa 100644 --- a/drivers/char/drm/savage_state.c +++ b/drivers/gpu/drm/savage/savage_state.c diff --git a/drivers/gpu/drm/sis/Makefile b/drivers/gpu/drm/sis/Makefile new file mode 100644 index 000000000000..441c061c3ad0 --- /dev/null +++ b/drivers/gpu/drm/sis/Makefile @@ -0,0 +1,10 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y = -Iinclude/drm +sis-y := sis_drv.o sis_mm.o + +obj-$(CONFIG_DRM_SIS) += sis.o + + diff --git a/drivers/char/drm/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c index 7dacc64e9b56..7dacc64e9b56 100644 --- a/drivers/char/drm/sis_drv.c +++ b/drivers/gpu/drm/sis/sis_drv.c diff --git a/drivers/char/drm/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h index ef940bad63f7..ef940bad63f7 100644 --- a/drivers/char/drm/sis_drv.h +++ b/drivers/gpu/drm/sis/sis_drv.h diff --git a/drivers/char/drm/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c index b3878770fce1..b3878770fce1 100644 --- a/drivers/char/drm/sis_mm.c +++ b/drivers/gpu/drm/sis/sis_mm.c diff --git a/drivers/gpu/drm/tdfx/Makefile b/drivers/gpu/drm/tdfx/Makefile new file mode 100644 index 000000000000..0379f294b32a --- /dev/null +++ b/drivers/gpu/drm/tdfx/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm +tdfx-y := tdfx_drv.o + +obj-$(CONFIG_DRM_TDFX) += tdfx.o diff --git a/drivers/char/drm/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c index 012ff2e356b2..012ff2e356b2 100644 --- a/drivers/char/drm/tdfx_drv.c +++ b/drivers/gpu/drm/tdfx/tdfx_drv.c diff --git a/drivers/char/drm/tdfx_drv.h b/drivers/gpu/drm/tdfx/tdfx_drv.h index 84204ec1b046..84204ec1b046 100644 --- a/drivers/char/drm/tdfx_drv.h +++ b/drivers/gpu/drm/tdfx/tdfx_drv.h diff --git a/drivers/gpu/drm/via/Makefile b/drivers/gpu/drm/via/Makefile new file mode 100644 index 000000000000..d59e258e2c13 --- /dev/null +++ b/drivers/gpu/drm/via/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm +via-y := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o + +obj-$(CONFIG_DRM_VIA) +=via.o diff --git a/drivers/char/drm/via_3d_reg.h b/drivers/gpu/drm/via/via_3d_reg.h index 462375d543b9..462375d543b9 100644 --- a/drivers/char/drm/via_3d_reg.h +++ b/drivers/gpu/drm/via/via_3d_reg.h diff --git a/drivers/char/drm/via_dma.c b/drivers/gpu/drm/via/via_dma.c index 7a339dba6a69..7a339dba6a69 100644 --- a/drivers/char/drm/via_dma.c +++ b/drivers/gpu/drm/via/via_dma.c diff --git a/drivers/char/drm/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 409e00afdd07..409e00afdd07 100644 --- a/drivers/char/drm/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c diff --git a/drivers/char/drm/via_dmablit.h b/drivers/gpu/drm/via/via_dmablit.h index 7408a547a036..7408a547a036 100644 --- a/drivers/char/drm/via_dmablit.h +++ b/drivers/gpu/drm/via/via_dmablit.h diff --git a/drivers/char/drm/via_drv.c b/drivers/gpu/drm/via/via_drv.c index 80c01cdfa37d..80c01cdfa37d 100644 --- a/drivers/char/drm/via_drv.c +++ b/drivers/gpu/drm/via/via_drv.c diff --git a/drivers/char/drm/via_drv.h b/drivers/gpu/drm/via/via_drv.h index 2daae81874cd..2daae81874cd 100644 --- a/drivers/char/drm/via_drv.h +++ b/drivers/gpu/drm/via/via_drv.h diff --git a/drivers/char/drm/via_irq.c b/drivers/gpu/drm/via/via_irq.c index c6bb978a1106..c6bb978a1106 100644 --- a/drivers/char/drm/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c diff --git a/drivers/char/drm/via_map.c b/drivers/gpu/drm/via/via_map.c index a967556be014..a967556be014 100644 --- a/drivers/char/drm/via_map.c +++ b/drivers/gpu/drm/via/via_map.c diff --git a/drivers/char/drm/via_mm.c b/drivers/gpu/drm/via/via_mm.c index e64094916e4f..e64094916e4f 100644 --- a/drivers/char/drm/via_mm.c +++ b/drivers/gpu/drm/via/via_mm.c diff --git a/drivers/char/drm/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c index 46a579198747..46a579198747 100644 --- a/drivers/char/drm/via_verifier.c +++ b/drivers/gpu/drm/via/via_verifier.c diff --git a/drivers/char/drm/via_verifier.h b/drivers/gpu/drm/via/via_verifier.h index d6f8214b69f5..d6f8214b69f5 100644 --- a/drivers/char/drm/via_verifier.h +++ b/drivers/gpu/drm/via/via_verifier.h diff --git a/drivers/char/drm/via_video.c b/drivers/gpu/drm/via/via_video.c index 6ec04ac12459..6ec04ac12459 100644 --- a/drivers/char/drm/via_video.c +++ b/drivers/gpu/drm/via/via_video.c diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index e0c5f96b273d..9b887ef64ff1 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -7,7 +7,7 @@ menu "Graphics support" source "drivers/char/agp/Kconfig" -source "drivers/char/drm/Kconfig" +source "drivers/gpu/drm/Kconfig" config VGASTATE tristate diff --git a/include/Kbuild b/include/Kbuild index b52288774345..bdca155028ec 100644 --- a/include/Kbuild +++ b/include/Kbuild @@ -4,5 +4,6 @@ header-y += sound/ header-y += mtd/ header-y += rdma/ header-y += video/ +header-y += drm/ header-y += asm-$(ARCH)/ diff --git a/include/drm/Kbuild b/include/drm/Kbuild new file mode 100644 index 000000000000..82b6983b7fbb --- /dev/null +++ b/include/drm/Kbuild @@ -0,0 +1,10 @@ +unifdef-y += drm.h drm_sarea.h +unifdef-y += i810_drm.h +unifdef-y += i830_drm.h +unifdef-y += i915_drm.h +unifdef-y += mga_drm.h +unifdef-y += r128_drm.h +unifdef-y += radeon_drm.h +unifdef-y += sis_drm.h +unifdef-y += savage_drm.h +unifdef-y += via_drm.h diff --git a/drivers/char/drm/drm.h b/include/drm/drm.h index 38d3c6b8276a..38d3c6b8276a 100644 --- a/drivers/char/drm/drm.h +++ b/include/drm/drm.h diff --git a/drivers/char/drm/drmP.h b/include/drm/drmP.h index 0764b662b339..0764b662b339 100644 --- a/drivers/char/drm/drmP.h +++ b/include/drm/drmP.h diff --git a/drivers/char/drm/drm_core.h b/include/drm/drm_core.h index 316739036079..316739036079 100644 --- a/drivers/char/drm/drm_core.h +++ b/include/drm/drm_core.h diff --git a/drivers/char/drm/drm_hashtab.h b/include/drm/drm_hashtab.h index cd2b189e1be6..cd2b189e1be6 100644 --- a/drivers/char/drm/drm_hashtab.h +++ b/include/drm/drm_hashtab.h diff --git a/drivers/char/drm/drm_memory.h b/include/drm/drm_memory.h index 63e425b5ea82..63e425b5ea82 100644 --- a/drivers/char/drm/drm_memory.h +++ b/include/drm/drm_memory.h diff --git a/drivers/char/drm/drm_memory_debug.h b/include/drm/drm_memory_debug.h index 6463271deea8..6463271deea8 100644 --- a/drivers/char/drm/drm_memory_debug.h +++ b/include/drm/drm_memory_debug.h diff --git a/drivers/char/drm/drm_os_linux.h b/include/drm/drm_os_linux.h index 8dbd2572b7c3..8dbd2572b7c3 100644 --- a/drivers/char/drm/drm_os_linux.h +++ b/include/drm/drm_os_linux.h diff --git a/drivers/char/drm/drm_pciids.h b/include/drm/drm_pciids.h index 135bd19499fc..135bd19499fc 100644 --- a/drivers/char/drm/drm_pciids.h +++ b/include/drm/drm_pciids.h diff --git a/drivers/char/drm/drm_sarea.h b/include/drm/drm_sarea.h index 480037331e4e..480037331e4e 100644 --- a/drivers/char/drm/drm_sarea.h +++ b/include/drm/drm_sarea.h diff --git a/drivers/char/drm/drm_sman.h b/include/drm/drm_sman.h index 08ecf83ad5d4..08ecf83ad5d4 100644 --- a/drivers/char/drm/drm_sman.h +++ b/include/drm/drm_sman.h diff --git a/drivers/char/drm/i810_drm.h b/include/drm/i810_drm.h index 7a10bb6f2c0f..7a10bb6f2c0f 100644 --- a/drivers/char/drm/i810_drm.h +++ b/include/drm/i810_drm.h diff --git a/drivers/char/drm/i830_drm.h b/include/drm/i830_drm.h index 4b00d2dd4f68..4b00d2dd4f68 100644 --- a/drivers/char/drm/i830_drm.h +++ b/include/drm/i830_drm.h diff --git a/drivers/char/drm/i915_drm.h b/include/drm/i915_drm.h index 05c66cf03a9e..05c66cf03a9e 100644 --- a/drivers/char/drm/i915_drm.h +++ b/include/drm/i915_drm.h diff --git a/drivers/char/drm/mga_drm.h b/include/drm/mga_drm.h index 944b50a5ff24..944b50a5ff24 100644 --- a/drivers/char/drm/mga_drm.h +++ b/include/drm/mga_drm.h diff --git a/drivers/char/drm/r128_drm.h b/include/drm/r128_drm.h index 8d8878b55f55..8d8878b55f55 100644 --- a/drivers/char/drm/r128_drm.h +++ b/include/drm/r128_drm.h diff --git a/drivers/char/drm/radeon_drm.h b/include/drm/radeon_drm.h index 73ff51f12311..73ff51f12311 100644 --- a/drivers/char/drm/radeon_drm.h +++ b/include/drm/radeon_drm.h diff --git a/drivers/char/drm/savage_drm.h b/include/drm/savage_drm.h index 8a576ef01821..8a576ef01821 100644 --- a/drivers/char/drm/savage_drm.h +++ b/include/drm/savage_drm.h diff --git a/drivers/char/drm/sis_drm.h b/include/drm/sis_drm.h index 30f7b3827466..30f7b3827466 100644 --- a/drivers/char/drm/sis_drm.h +++ b/include/drm/sis_drm.h diff --git a/drivers/char/drm/via_drm.h b/include/drm/via_drm.h index a3b5c102b067..a3b5c102b067 100644 --- a/drivers/char/drm/via_drm.h +++ b/include/drm/via_drm.h |