diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/video/console/vgacon.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/video/console/vgacon.c')
| -rw-r--r-- | drivers/video/console/vgacon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index 05735ff4e9c5..0a2c10a1abf8 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
| 39 | #include <linux/fs.h> | 39 | #include <linux/fs.h> |
| 40 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 41 | #include <linux/tty.h> | ||
| 42 | #include <linux/console.h> | 41 | #include <linux/console.h> |
| 43 | #include <linux/string.h> | 42 | #include <linux/string.h> |
| 44 | #include <linux/kd.h> | 43 | #include <linux/kd.h> |
| @@ -48,6 +47,7 @@ | |||
| 48 | #include <linux/spinlock.h> | 47 | #include <linux/spinlock.h> |
| 49 | #include <linux/ioport.h> | 48 | #include <linux/ioport.h> |
| 50 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 50 | #include <linux/screen_info.h> | ||
| 51 | #include <linux/smp_lock.h> | 51 | #include <linux/smp_lock.h> |
| 52 | #include <video/vga.h> | 52 | #include <video/vga.h> |
| 53 | #include <asm/io.h> | 53 | #include <asm/io.h> |