summaryrefslogtreecommitdiffstats
path: root/include/linux/console_struct.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2009-07-18 03:13:38 +0000
committerSteve French <sfrench@us.ibm.com>2009-07-18 03:13:38 +0000
commit287638b2c533165c3c03dfa15196c2ba583cd287 (patch)
treee753dd2cd7421a26e179c43d7f6d4d39541a4afb /include/linux/console_struct.h
parentf6c43385435640e056424034caac0d765c45e370 (diff)
parenta1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232 (diff)
downloadkernel-crypto-287638b2c533165c3c03dfa15196c2ba583cd287.tar.gz
kernel-crypto-287638b2c533165c3c03dfa15196c2ba583cd287.tar.xz
kernel-crypto-287638b2c533165c3c03dfa15196c2ba583cd287.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/console_struct.h')
-rw-r--r--include/linux/console_struct.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index d71f7c0f931..38fe59dc89a 100644
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -89,7 +89,6 @@ struct vc_data {
unsigned int vc_need_wrap : 1;
unsigned int vc_can_do_color : 1;
unsigned int vc_report_mouse : 2;
- unsigned int vc_kmalloced : 1;
unsigned char vc_utf : 1; /* Unicode UTF-8 encoding */
unsigned char vc_utf_count;
int vc_utf_char;