Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / char / rio / map.h

diff --git a/drivers/char/rio/map.h b/drivers/char/rio/map.h
index 400645a..bdbcd09 100644 (file)
--- a/drivers/char/rio/map.h
+++ b/drivers/char/rio/map.h
@@ -46,21 +46,20 @@ static char *_map_h_sccs_ = "@(#)map.h      1.2";
 #define        TOTAL_MAP_ENTRIES (MAX_MAP_ENTRY*RIO_SLOTS)
 #define        MAX_NAME_LEN 32
 
-struct Map
-{
-       uint    HostUniqueNum;          /* Supporting hosts unique number */
-       uint    RtaUniqueNum;           /* Unique number */
+struct Map {
+       unsigned int HostUniqueNum;     /* Supporting hosts unique number */
+       unsigned int RtaUniqueNum;      /* Unique number */
        /*
-       ** The next two IDs must be swapped on big-endian architectures
-       ** when using a v2.04 /etc/rio/config with a v3.00 driver (when
-       ** upgrading for example).
-       */
-       ushort  ID;                     /* ID used in the subnet */
-       ushort  ID2;                    /* ID of 2nd block of 8 for 16 port */
-       ulong   Flags;                  /* Booted, ID Given, Disconnected */
-       ulong   SysPort;                /* First tty mapped to this port */
-       struct Top   Topology[LINKS_PER_UNIT];  /* ID connected to each link */
-       char    Name[MAX_NAME_LEN];        /* Cute name by which RTA is known */
+        ** The next two IDs must be swapped on big-endian architectures
+        ** when using a v2.04 /etc/rio/config with a v3.00 driver (when
+        ** upgrading for example).
+        */
+       unsigned short ID;              /* ID used in the subnet */
+       unsigned short ID2;             /* ID of 2nd block of 8 for 16 port */
+       unsigned long Flags;            /* Booted, ID Given, Disconnected */
+       unsigned long SysPort;          /* First tty mapped to this port */
+       struct Top Topology[LINKS_PER_UNIT];    /* ID connected to each link */
+       char Name[MAX_NAME_LEN];        /* Cute name by which RTA is known */
 };
 
 /*