path: root/include
diff options
authorAlan Cox <alan@linux.intel.com>2009-11-19 13:30:36 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-19 13:43:06 -0800
commit308efab5e231d1510cd35931d87629bf5171caae (patch)
treef477e28706603dac927e352f2b0c23034f981808 /include
parent5854d9c8d18359b1fc2f23c0ef2d51dd53281bd6 (diff)
vt: Fix use of "new" in a struct field
As this struct is exposed to user space and the API was added for this release it's a bit of a pain for the C++ world and we still have time to fix it. Rename the fields before we end up with that pain in an actual release. Signed-off-by: Alan Cox <alan@linux.intel.com> Reported-by: Olivier Goffart Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/vt.h b/include/linux/vt.h
index 7afca0d7213..7ffa11f0623 100644
--- a/include/linux/vt.h
+++ b/include/linux/vt.h
@@ -70,8 +70,8 @@ struct vt_event {
#define VT_EVENT_UNBLANK 0x0004 /* Screen unblank */
#define VT_EVENT_RESIZE 0x0008 /* Resize display */
#define VT_MAX_EVENT 0x000F
- unsigned int old; /* Old console */
- unsigned int new; /* New console (if changing) */
+ unsigned int oldev; /* Old console */
+ unsigned int newev; /* New console (if changing) */
unsigned int pad[4]; /* Padding for expansion */