From 554d9de1d8b3d1e5c9f71155a1606795355272dd Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Wed, 23 May 2012 04:43:45 +0000 Subject: [PATCH] --- yaml --- r: 306950 b: refs/heads/master c: d0a24a3516fb36023bef28d2355fa34e7f32029f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/ipx.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 532c8964c211..216cd313c047 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37c106d0a444bcb48648ed1366890333972e5990 +refs/heads/master: d0a24a3516fb36023bef28d2355fa34e7f32029f diff --git a/trunk/include/linux/ipx.h b/trunk/include/linux/ipx.h index 8f0243982eb6..3d48014cdd71 100644 --- a/trunk/include/linux/ipx.h +++ b/trunk/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