diff options
author | Paul Mackerras <paulus@samba.org> | 2006-08-01 10:37:25 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-08-01 10:37:25 +1000 |
commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/video/hgafb.c | |
parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
download | op-kernel-dev-57cad8084e0837e0f2c97da789ec9b3f36809be9.zip op-kernel-dev-57cad8084e0837e0f2c97da789ec9b3f36809be9.tar.gz |
Merge branch 'merge'
Diffstat (limited to 'drivers/video/hgafb.c')
-rw-r--r-- | drivers/video/hgafb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c index 4e39035..fb9e672 100644 --- a/drivers/video/hgafb.c +++ b/drivers/video/hgafb.c @@ -36,7 +36,6 @@ #include <linux/spinlock.h> #include <linux/string.h> #include <linux/mm.h> -#include <linux/tty.h> #include <linux/slab.h> #include <linux/delay.h> #include <linux/fb.h> |