diff --git a/[refs] b/[refs]
index 167928ab7e91..30eb49258cfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d4984d8424182eba2774755ae2ae8145651e788
+refs/heads/master: e43a0edcb066935268b60c3444e30423bfee664c
diff --git a/trunk/drivers/staging/dt3155/dt3155.h b/trunk/drivers/staging/dt3155/dt3155.h
index 1bf786364eec..37d9fc6d0636 100644
--- a/trunk/drivers/staging/dt3155/dt3155.h
+++ b/trunk/drivers/staging/dt3155/dt3155.h
@@ -34,15 +34,8 @@ MA 02111-1307 USA
 #ifndef _DT3155_INC
 #define _DT3155_INC
 
-#ifdef __KERNEL__
 #include <linux/types.h>
 #include <linux/time.h>		/* struct timeval */
-#else
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <unistd.h>
-#endif
 
 
 #define TRUE  1