summaryrefslogtreecommitdiff
path: root/linux/gamma_drv.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2003-04-23 02:20:25 +0000
committerIan Romanick <idr@us.ibm.com>2003-04-23 02:20:25 +0000
commit189ad4f724036aeb37ef4e7b5b7d25e3f3250bd8 (patch)
treee59c024f2cfc4d93630697065b9d2c4dcf070b35 /linux/gamma_drv.c
parente9cced1b969aff998c5747f531f9cf7428f88bc7 (diff)
Merge from trunk.texmem-0-0-1
Diffstat (limited to 'linux/gamma_drv.c')
-rw-r--r--linux/gamma_drv.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c
index b41526bb..f1b8b205 100644
--- a/linux/gamma_drv.c
+++ b/linux/gamma_drv.c
@@ -39,16 +39,18 @@
#include "drm_auth.h"
#include "drm_agpsupport.h"
#include "drm_bufs.h"
-#include "drm_context.h"
+#include "gamma_context.h" /* NOTE! */
#include "drm_dma.h"
+#include "gamma_old_dma.h" /* NOTE */
#include "drm_drawable.h"
#include "drm_drv.h"
#include "drm_fops.h"
#include "drm_init.h"
#include "drm_ioctl.h"
-#include "drm_lists.h"
+#include "gamma_lists.h" /* NOTE */
#include "drm_lock.h"
+#include "gamma_lock.h" /* NOTE */
#include "drm_memory.h"
#include "drm_proc.h"
#include "drm_vm.h"