summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-11-05 18:04:52 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-11-23 20:14:43 +0000
commit23ed992a5ebe6964ebe312b54142fbc5e8185cdc (patch)
treec8ee2fa6f6a51fb1d0b43f19ec15dcc482b914ef /drivers/char
parentff26860fb53f2dcfaaaf1bf017b09dbdfddff5ee (diff)
downloadlinux-23ed992a5ebe6964ebe312b54142fbc5e8185cdc.tar.gz
linux-23ed992a5ebe6964ebe312b54142fbc5e8185cdc.tar.bz2
linux-23ed992a5ebe6964ebe312b54142fbc5e8185cdc.zip
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.c5
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 @@
#include <asm/smp.h>
#include "agp.h"
#include "intel-agp.h"
-#include <linux/intel-gtt.h>
#include <drm/intel-gtt.h>
/*
@@ -39,10 +38,6 @@
#define USE_PCI_DMA_API 0
#endif
-#define AGP_DCACHE_MEMORY 1
-#define AGP_PHYS_MEMORY 2
-#define INTEL_AGP_CACHED_MEMORY 3
-
struct intel_gtt_driver {
unsigned int gen : 8;
unsigned int is_g33 : 1;