Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / char / rio / unixrup.h

diff --git a/drivers/char/rio/unixrup.h b/drivers/char/rio/unixrup.h
index a126c7cabac63e357e83e2a7abe340d9a9281d38..4306e01dbf01436b0fd571b38e046883f7a475ac 100644 (file)
--- a/drivers/char/rio/unixrup.h
+++ b/drivers/char/rio/unixrup.h
@@ -45,9 +45,9 @@ struct UnixRup {
        struct CmdBlk *CmdsWaitingP;    /* Commands waiting to be done */
        struct CmdBlk *CmdPendingP;     /* The command currently being sent */
        struct RUP *RupP;       /* the Rup to send it to */
-       uint Id;                /* Id number */
-       uint BaseSysPort;       /* SysPort of first tty on this RTA */
-       uint ModTypes;          /* Modules on this RTA */
+       unsigned int Id;                /* Id number */
+       unsigned int BaseSysPort;       /* SysPort of first tty on this RTA */
+       unsigned int ModTypes;          /* Modules on this RTA */
        spinlock_t RupLock;     /* Lock structure for MPX */
        /*    struct lockb     RupLock; *//* Lock structure for MPX */
 };