From d909c696c4a541f9ecd6d40af4e46601f8399797 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 14 May 2008 23:24:09 -0700
Subject: [PATCH] --- yaml --- r: 97077 b: refs/heads/master c:
 a1a61a435b3cc157830b7d42b175151ae5eabdd3 h: refs/heads/master i:   97075:
 c0951b3577aece6b9bb70f91ecb0720974b601d4 v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/atm.h     |  7 ++-----
 trunk/include/linux/atm_tcp.h | 12 +++++-------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index bb944d866ae2..9cef27bad71a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38d2f38be9e4a2f1e3324c973a903aa972f71d0f
+refs/heads/master: a1a61a435b3cc157830b7d42b175151ae5eabdd3
diff --git a/trunk/include/linux/atm.h b/trunk/include/linux/atm.h
index 60136684e0af..c791ddd96939 100644
--- a/trunk/include/linux/atm.h
+++ b/trunk/include/linux/atm.h
@@ -16,14 +16,11 @@
  * documentation. Do not change them.
  */
 
-#ifdef __KERNEL__
-#include <linux/socket.h>
-#include <linux/types.h>
-#endif
 #include <linux/compiler.h>
 #include <linux/atmapi.h>
 #include <linux/atmsap.h>
 #include <linux/atmioc.h>
+#include <linux/types.h>
 
 
 /* general ATM constants */
@@ -212,7 +209,7 @@ struct sockaddr_atmsvc {
         char		pub[ATM_E164_LEN+1]; /* public address (E.164) */
     					/* unused addresses must be bzero'ed */
 	char		lij_type;	/* role in LIJ call; one of ATM_LIJ* */
-	uint32_t	lij_id;		/* LIJ call identifier */
+	__u32	lij_id;		/* LIJ call identifier */
     } sas_addr __ATM_API_ALIGN;		/* SVC address */
 };
 
diff --git a/trunk/include/linux/atm_tcp.h b/trunk/include/linux/atm_tcp.h
index 18787f9b2f19..375638f8554b 100644
--- a/trunk/include/linux/atm_tcp.h
+++ b/trunk/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 */
 };
 
 /*