Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / linux / screen_info.h

diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index 76850b75b3f6892392b7e5e5480712225405d74f..6336987dae6283806a531b6f7bf8d13efc0e9840 100644 (file)
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -41,8 +41,7 @@ struct screen_info {
        u16 vesapm_off;         /* 0x30 */
        u16 pages;              /* 0x32 */
        u16 vesa_attributes;    /* 0x34 */
-       u32  capabilities;      /* 0x36 */
-                               /* 0x3a -- 0x3f reserved for future expansion */
+                               /* 0x36 -- 0x3f reserved for future expansion */
 };
 
 extern struct screen_info screen_info;