Merge branch 'mainline' into upstream-linus

[linux-2.6-omap-h63xx.git] / drivers / video / pm3fb.c

diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 52c18a35fb411d0cd5c6f8b9c3d81010195ddc2a..1d81ef47efd336a1f66536d9190e0b190963b876 100644 (file)
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -52,13 +52,11 @@
  *  Wed Feb 21 14:47:06 CET 2001, v 1.0.0: First working version
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>