diff -urN oldtree/drivers/video/vesafb-thread.c newtree/drivers/video/vesafb-thread.c
--- oldtree/drivers/video/vesafb-thread.c	2006-09-30 07:19:56.000000000 -0400
+++ newtree/drivers/video/vesafb-thread.c	2006-09-30 10:21:31.000000000 -0400
@@ -28,7 +28,9 @@
 #include <asm/mmu_context.h>
 #include "edid.h"
 
+#ifdef MODULE
 int errno;
+#endif
 
 static DECLARE_COMPLETION(vesafb_th_completion);
 static DECLARE_MUTEX(vesafb_task_list_sem);
diff -urN oldtree/drivers/video/vesafb-tng.c newtree/drivers/video/vesafb-tng.c
--- oldtree/drivers/video/vesafb-tng.c	2006-09-30 07:19:56.000000000 -0400
+++ newtree/drivers/video/vesafb-tng.c	2006-09-30 10:21:55.000000000 -0400
@@ -1561,8 +1561,8 @@
 MODULE_PARM_DESC(vgapal,"bool: set palette using VGA registers");
 module_param_named(pmipal, pmi_setpal, bool, 0);
 MODULE_PARM_DESC(pmipal,"bool: set palette using PMI calls");
-module_param_named(nomtrr, mtrr, invbool, 0);
-MODULE_PARM_DESC(nomtrr,"bool: disable use of MTRR registers");
+module_param(mtrr, uint, 0);
+MODULE_PARM_DESC(mtrr,"Memory Type Range Registers setting. Use 0 to disable.");
 module_param(blank, bool, 1);
 MODULE_PARM_DESC(blank,"bool: enable hardware blanking");
 module_param(nocrtc, bool, 0);
Files oldtree/scripts/kconfig/mconf and newtree/scripts/kconfig/mconf differ