summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-05-24 00:34:01 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-05-24 00:34:01 -0700
commit5de88bb52a04e698ecbfeb10667140a6564396ff (patch)
treea0f492c4cbfa574e290031f9addb46c6ab54b33e
parentd9a704eee39f8813ce1e22b82ea612076beb7151 (diff)
Fix up more headers to make the drm merge compile more cleanly
-rw-r--r--drivers/char/drm/i810_dma.c2
-rw-r--r--drivers/char/drm/i830_dma.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c
index 9dc1e45fa325..fae1a8ab2a5a 100644
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
@@ -35,6 +35,8 @@
#include "drmP.h"
#include "i810_drv.h"
#include <linux/interrupt.h> /* For task queue support */
+#include <linux/delay.h>
+#include <linux/pagemap.h>
#define I810_BUF_FREE 2
#define I810_BUF_CLIENT 1
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index a0a61856e76c..6ca0628b5781 100644
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -36,6 +36,8 @@
#include "drmP.h"
#include "i830_drv.h"
#include <linux/interrupt.h> /* For task queue support */
+#include <linux/delay.h>
+#include <linux/pagemap.h>
/* in case we don't have a 2.3.99-pre6 kernel or later: */
#ifndef VM_DONTCOPY