Merge tag 'srpt-srq-type' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[mv-sheeva.git] / include / linux / irda.h

diff --git a/include/linux/irda.h b/include/linux/irda.h
index 00bdad0e8515a007c112b7d055af603dbd02f46c..a014c325231129a226ac4c579f5e42154b447cd5 100644 (file)
--- a/include/linux/irda.h
+++ b/include/linux/irda.h
@@ -26,12 +26,9 @@
 #define KERNEL_IRDA_H
 
 #include <linux/types.h>
+#include <linux/socket.h>
 
-/* Please do *not* add any #include in this file, this file is
- * included as-is in user space.
- * Please fix the calling file to properly included needed files before
- * this one, or preferably to include <net/irda/irda.h> instead.
- * Jean II */
+/* Note that this file is shared with user space. */
 
 /* Hint bit positions for first hint byte */
 #define HINT_PNP         0x01
@@ -125,7 +122,7 @@ enum {
 #define LSAP_ANY              0xff
 
 struct sockaddr_irda {
-       sa_family_t sir_family;   /* AF_IRDA */
+       __kernel_sa_family_t sir_family; /* AF_IRDA */
        __u8        sir_lsap_sel; /* LSAP selector */
        __u32       sir_addr;     /* Device address */
        char        sir_name[25]; /* Usually <service>:IrDA:TinyTP */