Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[sfrench/cifs-2.6.git] / include / linux / atmarp.h

diff --git a/include/linux/atmarp.h b/include/linux/atmarp.h
index ee108f9e9cb7a37092c46fe963c9945718ecc40d..231f4bdec730e2df575f8a99f9f1906d3ac012fd 100644 (file)
--- a/include/linux/atmarp.h
+++ b/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>