summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2007-01-07 22:37:40 -0800
committerKeith Packard <keithp@neko.keithp.com>2007-01-07 22:37:40 -0800
commitc5aaf7648df82665851c9e67f5509b427ca34c8e (patch)
tree55b317738a99097cb02ba6a736b9ef20de6b34f3 /.gitignore
parent63c0f3946056d044b7c5688fa5cb670782212c77 (diff)
parentd0080d71b9f3df0d4f743324b7e8f1ce580bdcaf (diff)
Merge branch 'master' into crestline
Conflicts: shared-core/i915_drm.h Whitespace change only
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore104
1 files changed, 53 insertions, 51 deletions
diff --git a/.gitignore b/.gitignore
index 333bbadc..d38beb78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,54 +1,55 @@
-*-core/linux
-*-core/drm.h
-*-core/drm_sarea.h
-*-core/i915_dma.c
-*-core/i915_drm.h
-*-core/i915_drv.h
-*-core/i915_irq.c
-*-core/i915_mem.c
-*-core/mach64_dma.c
-*-core/mach64_drm.h
-*-core/mach64_drv.h
-*-core/mach64_irq.c
-*-core/mach64_state.c
-*-core/mga_dma.c
-*-core/mga_drm.h
-*-core/mga_drv.h
-*-core/mga_irq.c
-*-core/mga_state.c
-*-core/mga_ucode.h
-*-core/mga_warp.c
-*-core/nv_drv.h
-*-core/r128_cce.c
-*-core/r128_drm.h
-*-core/r128_drv.h
-*-core/r128_irq.c
-*-core/r128_state.c
-*-core/r300_cmdbuf.c
-*-core/r300_reg.h
-*-core/radeon_cp.c
-*-core/radeon_drm.h
-*-core/radeon_drv.h
-*-core/radeon_irq.c
-*-core/radeon_mem.c
-*-core/radeon_state.c
-*-core/savage_bci.c
-*-core/savage_drm.h
-*-core/savage_drv.h
-*-core/savage_state.c
-*-core/sis_drm.h
-*-core/sis_drv.h
-*-core/tdfx_drv.h
-*-core/via_3d_reg.h
-*-core/via_dma.c
-*-core/via_drm.h
-*-core/via_drv.c
-*-core/via_drv.h
-*-core/via_irq.c
-*-core/via_map.c
-*-core/via_verifier.c
-*-core/via_verifier.h
-*-core/via_video.c
+bsd-core/linux
+bsd-core/drm.h
+bsd-core/drm_sarea.h
+bsd-core/i915_dma.c
+bsd-core/i915_drm.h
+bsd-core/i915_drv.h
+bsd-core/i915_irq.c
+bsd-core/i915_mem.c
+bsd-core/mach64_dma.c
+bsd-core/mach64_drm.h
+bsd-core/mach64_drv.h
+bsd-core/mach64_irq.c
+bsd-core/mach64_state.c
+bsd-core/mga_dma.c
+bsd-core/mga_drm.h
+bsd-core/mga_drv.h
+bsd-core/mga_irq.c
+bsd-core/mga_state.c
+bsd-core/mga_ucode.h
+bsd-core/mga_warp.c
+bsd-core/nv_drv.h
+bsd-core/r128_cce.c
+bsd-core/r128_drm.h
+bsd-core/r128_drv.h
+bsd-core/r128_irq.c
+bsd-core/r128_state.c
+bsd-core/r300_cmdbuf.c
+bsd-core/r300_reg.h
+bsd-core/radeon_cp.c
+bsd-core/radeon_drm.h
+bsd-core/radeon_drv.h
+bsd-core/radeon_irq.c
+bsd-core/radeon_mem.c
+bsd-core/radeon_state.c
+bsd-core/savage_bci.c
+bsd-core/savage_drm.h
+bsd-core/savage_drv.h
+bsd-core/savage_state.c
+bsd-core/sis_drm.h
+bsd-core/sis_drv.h
+bsd-core/tdfx_drv.h
+bsd-core/via_3d_reg.h
+bsd-core/via_dma.c
+bsd-core/via_drm.h
+bsd-core/via_drv.c
+bsd-core/via_drv.h
+bsd-core/via_irq.c
+bsd-core/via_map.c
+bsd-core/via_verifier.c
+bsd-core/via_verifier.h
+bsd-core/via_video.c
+*~
*.flags
*.ko
*.ko.cmd
@@ -74,6 +75,7 @@ config.log
config.status
config.sub
configure
+cscope.*
depcomp
device_if.h
drm.kld