Merge branch 'fixes' into for-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / ipx.h

diff --git a/include/linux/ipx.h b/include/linux/ipx.h
index 8f0243982eb6a5b7212f5f8a8a9bed3bd8d9dbb5..3d48014cdd71d0d120693594e50a4b1cbc3155cc 100644 (file)
--- a/include/linux/ipx.h
+++ b/include/linux/ipx.h
@@ -38,7 +38,7 @@ struct ipx_interface_definition {
 #define IPX_FRAME_8022         2
 #define IPX_FRAME_ETHERII      3
 #define IPX_FRAME_8023         4
-/* obsolete token ring was     5 */
+#define IPX_FRAME_TR_8022       5 /* obsolete */
        unsigned char ipx_special;
 #define IPX_SPECIAL_NONE       0
 #define IPX_PRIMARY            1