Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / drivers / video / i810 / i810_accel.c

diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
index 84f9cc10636f1ffb63b9863e8f13abaa935bd9cb..76764ea3486a7d31a77e0887548ea17696819672 100644 (file)
--- a/drivers/video/i810/i810_accel.c
+++ b/drivers/video/i810/i810_accel.c
@@ -14,6 +14,7 @@
 
 #include "i810_regs.h"
 #include "i810.h"
+#include "i810_main.h"
 
 static u32 i810fb_rop[] = {
        COLOR_COPY_ROP, /* ROP_COPY */