drivers/leds/leds-renesas-tpu.c: update driver to use workqueue

[pandora-kernel.git] / include / linux / if_pppox.h

diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 397921b..b5f927f 100644 (file)
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -20,8 +20,9 @@
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
-#ifdef  __KERNEL__
+#include <linux/socket.h>
 #include <linux/if_ether.h>
+#ifdef  __KERNEL__
 #include <linux/if.h>
 #include <linux/netdevice.h>
 #include <linux/ppp_channel.h>
@@ -63,7 +64,7 @@ struct pptp_addr {
 #define PX_MAX_PROTO   3
 
 struct sockaddr_pppox {
-       sa_family_t     sa_family;            /* address family, AF_PPPOX */
+       __kernel_sa_family_t sa_family;       /* address family, AF_PPPOX */
        unsigned int    sa_protocol;          /* protocol identifier */
        union {
                struct pppoe_addr  pppoe;
@@ -77,7 +78,7 @@ struct sockaddr_pppox {
  * type instead.
  */
 struct sockaddr_pppol2tp {
-       sa_family_t     sa_family;      /* address family, AF_PPPOX */
+       __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
        unsigned int    sa_protocol;    /* protocol identifier */
        struct pppol2tp_addr pppol2tp;
 } __attribute__((packed));
@@ -86,7 +87,7 @@ struct sockaddr_pppol2tp {
  * bits. So we need a different sockaddr structure.
  */
 struct sockaddr_pppol2tpv3 {
-       sa_family_t     sa_family;      /* address family, AF_PPPOX */
+       __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
        unsigned int    sa_protocol;    /* protocol identifier */
        struct pppol2tpv3_addr pppol2tp;
 } __attribute__((packed));