diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:12:20 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:12:20 -0400 |
| commit | 165415f700b0c77fa1f8db6198f48582639adf78 (patch) | |
| tree | 088e305b0b5b0c6753072e13be1177824c3ed59d /drivers/video/console/fbcon.h | |
| parent | c324b44c34050cf2a9b58830e11c974806bd85d8 (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/video/console/fbcon.h')
| -rw-r--r-- | drivers/video/console/fbcon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h index 5d377860bce2..08befafe11d1 100644 --- a/drivers/video/console/fbcon.h +++ b/drivers/video/console/fbcon.h | |||
| @@ -18,7 +18,8 @@ | |||
| 18 | 18 | ||
| 19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 20 | 20 | ||
| 21 | #define FBCON_FLAGS_INIT 1 | 21 | #define FBCON_FLAGS_INIT 1 |
| 22 | #define FBCON_FLAGS_CURSOR_TIMER 2 | ||
| 22 | 23 | ||
| 23 | /* | 24 | /* |
| 24 | * This is the interface between the low-level console driver and the | 25 | * This is the interface between the low-level console driver and the |