Merge branch 'r8169-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[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..7abf0cba0f2c8f9953b3f2f4230a9c255867a7ea 100644 (file)
--- a/drivers/char/rio/unixrup.h
+++ b/drivers/char/rio/unixrup.h
@@ -33,10 +33,6 @@
 #ifndef __rio_unixrup_h__
 #define __rio_unixrup_h__
 
-#ifdef SCCS_LABELS
-static char *_unixrup_h_sccs_ = "@(#)unixrup.h 1.2";
-#endif
-
 /*
 **    UnixRup data structure. This contains pointers to actual RUPs on the
 **    host card, and all the command/boot control stuff.
@@ -44,10 +40,10 @@ static char *_unixrup_h_sccs_ = "@(#)unixrup.h      1.2";
 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 */
+       struct RUP __iomem *RupP;       /* the Rup to send it to */
+       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 */
 };