diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-11-06 10:01:52 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-11-06 10:01:52 +0100 |
| commit | c07dd80269fad45fdad61de0a43fe3d15cd1a119 (patch) | |
| tree | 1701583cb628c170c4945fa0dad63aef742a0ca1 /shared-core/i915_dma.c | |
| parent | 5ce43a346cb9b2a6f6f31f1f750db75d5628c15b (diff) | |
| parent | 40fb079aebae4277813e6a32e2e93c81dc0038e3 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'shared-core/i915_dma.c')
| -rw-r--r-- | shared-core/i915_dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index ed3a07d6..47befeb5 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -1312,4 +1312,3 @@ int i915_driver_device_is_agp(struct drm_device * dev) return 1; } - |