diff --git a/[refs] b/[refs]
index 920e6b42b34b..638e64a4a1e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0089bf1fb1e524fba4f86e98a9af7f03a0a8c932
+refs/heads/master: 522f1f63cfca29a14ff5efacac9c2cce69d8508b
diff --git a/trunk/drivers/staging/xgifb/XGIfb.h b/trunk/drivers/staging/xgifb/XGIfb.h
index bb4640abda98..b6715ba9b681 100644
--- a/trunk/drivers/staging/xgifb/XGIfb.h
+++ b/trunk/drivers/staging/xgifb/XGIfb.h
@@ -1,6 +1,5 @@
 #ifndef _LINUX_XGIFB
 #define _LINUX_XGIFB
-#include <linux/spinlock.h>
 #include <asm/ioctl.h>
 #include <asm/types.h>
 
@@ -190,8 +189,6 @@ struct video_info{
         unsigned long  XGI310_AccelDepth;
         unsigned long  CommandReg;
 
-        spinlock_t     lockaccel;
-
         unsigned int   pcibus;
         unsigned int   pcislot;
         unsigned int   pcifunc;