summaryrefslogtreecommitdiffstats
path: root/drivers/video/asiliantfb.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2006-08-05 04:50:27 +0200
committerDmitry Torokhov <dtor@insightbb.com>2006-08-05 04:50:27 +0200
commitd932cb7e630cae3b6b5307b767d296ff1a597c5e (patch)
treef930d068a12a256fabef0864bcdf8e85f095369e /drivers/video/asiliantfb.c
parentInput: serio/gameport - check whether driver core calls succeeded (diff)
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff)
downloadlinux-d932cb7e630cae3b6b5307b767d296ff1a597c5e.tar.xz
linux-d932cb7e630cae3b6b5307b767d296ff1a597c5e.zip
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/video/asiliantfb.c')
-rw-r--r--drivers/video/asiliantfb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index eaeaf4d1a094..1fd22f460b0f 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -34,7 +34,6 @@
#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>