diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /drivers/video/cyberfb.c | |
parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
download | op-kernel-dev-4bf311ddfbffe12d41ad1a3c311ab727db6f72cb.zip op-kernel-dev-4bf311ddfbffe12d41ad1a3c311ab727db6f72cb.tar.gz |
Merge branch 'master'
Diffstat (limited to 'drivers/video/cyberfb.c')
-rw-r--r-- | drivers/video/cyberfb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c index a3e189f..c40e72d 100644 --- a/drivers/video/cyberfb.c +++ b/drivers/video/cyberfb.c @@ -81,7 +81,6 @@ #include <linux/errno.h> #include <linux/string.h> #include <linux/mm.h> -#include <linux/tty.h> #include <linux/slab.h> #include <linux/delay.h> #include <linux/zorro.h> |