diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
| commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
| tree | d9523b531156fedb204e31b4612519b0a7a003e7 /include/linux/vt.h | |
| parent | 3906f4edeef976c081c4e7bd92164d2f59c325ae (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'include/linux/vt.h')
| -rw-r--r-- | include/linux/vt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/vt.h b/include/linux/vt.h index 8ab334a48222..ba806e8711be 100644 --- a/include/linux/vt.h +++ b/include/linux/vt.h | |||
| @@ -60,5 +60,6 @@ struct vt_consize { | |||
| 60 | #define VT_RESIZEX 0x560A /* set kernel's idea of screensize + more */ | 60 | #define VT_RESIZEX 0x560A /* set kernel's idea of screensize + more */ |
| 61 | #define VT_LOCKSWITCH 0x560B /* disallow vt switching */ | 61 | #define VT_LOCKSWITCH 0x560B /* disallow vt switching */ |
| 62 | #define VT_UNLOCKSWITCH 0x560C /* allow vt switching */ | 62 | #define VT_UNLOCKSWITCH 0x560C /* allow vt switching */ |
| 63 | #define VT_GETHIFONTMASK 0x560D /* return hi font mask */ | ||
| 63 | 64 | ||
| 64 | #endif /* _LINUX_VT_H */ | 65 | #endif /* _LINUX_VT_H */ |