diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-11-05 13:04:52 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-23 15:14:43 -0500 |
commit | 23ed992a5ebe6964ebe312b54142fbc5e8185cdc (patch) | |
tree | c8ee2fa6f6a51fb1d0b43f19ec15dcc482b914ef /drivers/char | |
parent | ff26860fb53f2dcfaaaf1bf017b09dbdfddff5ee (diff) |
drm/i915|intel-gtt: consolidate intel-gtt.h headers
... and a few other defines.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/agp/intel-gtt.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 72267c801637..291ac5113576 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <asm/smp.h> | 24 | #include <asm/smp.h> |
25 | #include "agp.h" | 25 | #include "agp.h" |
26 | #include "intel-agp.h" | 26 | #include "intel-agp.h" |
27 | #include <linux/intel-gtt.h> | ||
28 | #include <drm/intel-gtt.h> | 27 | #include <drm/intel-gtt.h> |
29 | 28 | ||
30 | /* | 29 | /* |
@@ -39,10 +38,6 @@ | |||
39 | #define USE_PCI_DMA_API 0 | 38 | #define USE_PCI_DMA_API 0 |
40 | #endif | 39 | #endif |
41 | 40 | ||
42 | #define AGP_DCACHE_MEMORY 1 | ||
43 | #define AGP_PHYS_MEMORY 2 | ||
44 | #define INTEL_AGP_CACHED_MEMORY 3 | ||
45 | |||
46 | struct intel_gtt_driver { | 41 | struct intel_gtt_driver { |
47 | unsigned int gen : 8; | 42 | unsigned int gen : 8; |
48 | unsigned int is_g33 : 1; | 43 | unsigned int is_g33 : 1; |