atm: Cleanup atm_tcp.h and atm.h for userspace.

[linux-2.6-omap-h63xx.git] / include / linux / atm_tcp.h

diff --git a/include/linux/atm_tcp.h b/include/linux/atm_tcp.h
index 18787f9b2f194ac686bcef4dd17eb959693c46e9..375638f8554b93c8338d0d8499688e329c4ffbfb 100644 (file)
--- a/include/linux/atm_tcp.h
+++ b/include/linux/atm_tcp.h
@@ -8,11 +8,9 @@
 #define LINUX_ATM_TCP_H
 
 #include <linux/atmapi.h>
-
-#ifdef __KERNEL__
-#include <linux/types.h>
-#endif
+#include <linux/atm.h>
 #include <linux/atmioc.h>
+#include <linux/types.h>
 
 
 /*
@@ -20,9 +18,9 @@
  */
 
 struct atmtcp_hdr {
-       uint16_t        vpi;
-       uint16_t        vci;
-       uint32_t        length;         /* ... of data part */
+       __u16   vpi;
+       __u16   vci;
+       __u32   length;         /* ... of data part */
 };
 
 /*