Automatic merge of /spare/repo/netdev-2.6 branch 8139too-iomap

[~andy/linux] / drivers / video / vesafb.c

diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 8fc1278d7fbddaac58b88d694ff90ba1e3bb1091..3027841f9c2466eb17b4b0bcb779dc11029fdc2d 100644 (file)
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -19,9 +19,6 @@
 #include <linux/fb.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#ifdef __i386__
-#include <video/edid.h>
-#endif
 #include <asm/io.h>
 #include <asm/mtrr.h>