diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 20:05:26 -0700 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 20:05:26 -0700 | 
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /include/linux/vt.h | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'include/linux/vt.h')
| -rw-r--r-- | include/linux/vt.h | 3 | 
1 files changed, 1 insertions, 2 deletions
| diff --git a/include/linux/vt.h b/include/linux/vt.h index 778b7b2a47d4..d5dd0bc408fd 100644 --- a/include/linux/vt.h +++ b/include/linux/vt.h @@ -27,7 +27,7 @@ struct vt_mode {  #define VT_SETMODE	0x5602	/* set mode of active vt */  #define		VT_AUTO		0x00	/* auto vt switching */  #define		VT_PROCESS	0x01	/* process controls switching */ -#define		VT_PROCESS_AUTO 0x02	/* process is notified of switching */ +#define		VT_ACKACQ	0x02	/* acknowledge switch */  struct vt_stat {  	unsigned short v_active;	/* active vt */ @@ -38,7 +38,6 @@ struct vt_stat {  #define VT_SENDSIG	0x5604	/* signal to send to bitmask of vts */  #define VT_RELDISP	0x5605	/* release display */ -#define		VT_ACKACQ	0x02	/* acknowledge switch */  #define VT_ACTIVATE	0x5606	/* make vt active */  #define VT_WAITACTIVE	0x5607	/* wait for vt active */ | 
