Merge http://linux-isdn.bkbits.net/linux-2.5.misc

into home.transmeta.com:/home/torvalds/v2.5/linux

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

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