Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

[linux-2.6] / include / linux / if_fddi.h

diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h
index 1288a16..45de104 100644 (file)
--- a/include/linux/if_fddi.h
+++ b/include/linux/if_fddi.h
@@ -12,7 +12,7 @@
  *             if_fddi.h is based on previous if_ether.h and if_tr.h work by
  *                     Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *                     Donald Becker, <becker@super.org>
- *                     Alan Cox, <alan@redhat.com>
+ *                     Alan Cox, <alan@lxorguk.ukuu.org.uk>
  *                     Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
  *                     Peter De Schrijver, <stud11@cc4.kuleuven.ac.be>
  *
@@ -24,6 +24,8 @@
 #ifndef _LINUX_IF_FDDI_H
 #define _LINUX_IF_FDDI_H
 
+#include <linux/types.h>
+
 /*
  *  Define max and min legal sizes.  The frame sizes do not include
  *  4 byte FCS/CRC (frame check sequence).
@@ -102,6 +104,9 @@ struct fddihdr
                } hdr;
        } __attribute__ ((packed));
 
+#ifdef __KERNEL__
+#include <linux/netdevice.h>
+
 /* Define FDDI statistics structure */
 struct fddi_statistics {
 
@@ -193,5 +198,6 @@ struct fddi_statistics {
        __u32   port_ler_flag[2];
        __u32   port_hardware_present[2];
        };
+#endif /* __KERNEL__ */
 
 #endif /* _LINUX_IF_FDDI_H */