diff --git a/[refs] b/[refs]
index 93f8a9c1943d..fe80229b9404 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab17a4ac32ac914cc6d65f25b21bdcaf453c35cf
+refs/heads/master: b8564d7b3855660e01faa7ba7a4e0303e5a13dfd
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index 867012b48a01..68bc1d839ad6 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -28,7 +28,6 @@
 #include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
-#include <linux/kernel.h>
 
 #include "osdef.h"
 
diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c
index b85ca9ba8076..08a02e3aaa5a 100644
--- a/trunk/drivers/staging/xgifb/vb_init.c
+++ b/trunk/drivers/staging/xgifb/vb_init.c
@@ -41,7 +41,6 @@
 
 #ifdef LINUX_KERNEL
 #include <asm/io.h>
-#include <linux/types.h>
 #endif