Index: arch/ia32/include/pm.h
===================================================================
--- arch/ia32/include/pm.h	(revision de07bcf5893aee4d667e2094636cd1512e4be1d8)
+++ arch/ia32/include/pm.h	(revision 2bb8648e46a151efe13c3bb8385ced857a95758d)
@@ -31,5 +31,5 @@
 
 #define IDT_ITEMS 64
-#define GDT_ITEMS 8
+#define GDT_ITEMS 7
 
 #define VESA_INIT_SEGMENT 0x8000
@@ -42,5 +42,14 @@
 #define TSS_DES		5
 #define TLS_DES         6 /* Pointer to Thread-Local-Storage data */
+
+#ifdef CONFIG_FB
+
+#define VESA_INIT_SEGMENT 0x8000
 #define VESA_INIT_DES 7
+#undef GDT_ITEMS
+#define GDT_ITEMS 8
+
+#endif /* CONFIG_FB */
+
 
 #define selector(des)	((des)<<3)
