Commit a800d54e authored by Linus Torvalds's avatar Linus Torvalds

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

into home.transmeta.com:/home/torvalds/v2.5/linux
parents b2b46cb2 5de88bb5
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
#include "drmP.h" #include "drmP.h"
#include "i810_drv.h" #include "i810_drv.h"
#include <linux/interrupt.h> /* For task queue support */ #include <linux/interrupt.h> /* For task queue support */
#include <linux/delay.h>
#include <linux/pagemap.h>
#define I810_BUF_FREE 2 #define I810_BUF_FREE 2
#define I810_BUF_CLIENT 1 #define I810_BUF_CLIENT 1
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
#include "drmP.h" #include "drmP.h"
#include "i830_drv.h" #include "i830_drv.h"
#include <linux/interrupt.h> /* For task queue support */ #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: */ /* in case we don't have a 2.3.99-pre6 kernel or later: */
#ifndef VM_DONTCOPY #ifndef VM_DONTCOPY
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment