Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

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

diff --git a/include/linux/atm.h b/include/linux/atm.h
index 60136684e0af5e9d2e9151cbca29d5784afae5ef..c791ddd969390578093843af29821e42ce0f460a 100644 (file)
--- 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 */
 };