diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
| commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
| tree | f930d068a12a256fabef0864bcdf8e85f095369e /drivers/video/tdfxfb.c | |
| parent | 73b59a3b1c09e4bfc678400b77b96134dcfbf112 (diff) | |
| parent | f5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/video/tdfxfb.c')
| -rw-r--r-- | drivers/video/tdfxfb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index 239b1496874b..689ce0270b81 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | #include <linux/errno.h> | 63 | #include <linux/errno.h> |
| 64 | #include <linux/string.h> | 64 | #include <linux/string.h> |
| 65 | #include <linux/mm.h> | 65 | #include <linux/mm.h> |
| 66 | #include <linux/tty.h> | ||
| 67 | #include <linux/slab.h> | 66 | #include <linux/slab.h> |
| 68 | #include <linux/delay.h> | 67 | #include <linux/delay.h> |
| 69 | #include <linux/interrupt.h> | 68 | #include <linux/interrupt.h> |