diff --git a/[refs] b/[refs]
index e72e32a83433..6cb0f0463c06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6
+refs/heads/master: 42c05f6e6e3d57495054a4cae35850b3f7d1c343
diff --git a/trunk/include/linux/atmarp.h b/trunk/include/linux/atmarp.h
index ee108f9e9cb7..231f4bdec730 100644
--- a/trunk/include/linux/atmarp.h
+++ b/trunk/include/linux/atmarp.h
@@ -6,9 +6,7 @@
 #ifndef _LINUX_ATMARP_H
 #define _LINUX_ATMARP_H
 
-#ifdef __KERNEL__
 #include <linux/types.h>
-#endif
 #include <linux/atmapi.h>
 #include <linux/atmioc.h>