summaryrefslogtreecommitdiffstats
path: root/include/linux/atm.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-05-14 23:24:09 -0700
committerDavid S. Miller <davem@davemloft.net>2008-05-14 23:24:09 -0700
commita1a61a435b3cc157830b7d42b175151ae5eabdd3 (patch)
tree5c8a8d9561551a8666c9a78cbef64a91e901b48d /include/linux/atm.h
parent38d2f38be9e4a2f1e3324c973a903aa972f71d0f (diff)
downloadop-kernel-dev-a1a61a435b3cc157830b7d42b175151ae5eabdd3.zip
op-kernel-dev-a1a61a435b3cc157830b7d42b175151ae5eabdd3.tar.gz
atm: Cleanup atm_tcp.h and atm.h for userspace.
The atm_tcp.h uses types from linux/atm.h, but does not include it. It should also use the standard __u## types from linux/types.h rather than the uint##_t types since the former can be found with the kernel already. Same goes for linux/atm.h. The linux/socket.h include there also gets dropped as atm.h does not actually use anything from socket.h. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/atm.h')
-rw-r--r--include/linux/atm.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/atm.h b/include/linux/atm.h
index 60136684..c791ddd 100644
--- a/include/linux/atm.h
+++ b/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 */
};
OpenPOWER on IntegriCloud