Merge branch 'upstream'

[linux-2.6-omap-h63xx.git] / drivers / char / rio / riotable.c

diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c
index 42c3dffcbbb2c49b96ebce8f669518102a7614c5..a86b216ab6539f674f8d31e0b8a3f00800b33517 100644 (file)
--- a/drivers/char/rio/riotable.c
+++ b/drivers/char/rio/riotable.c
@@ -754,11 +754,6 @@ struct Map *HostMapP;
        ushort RtaType;
        unsigned long flags;
 
-#ifdef CHECK
-       CheckHostP(HostP);
-       CheckHostMapP(HostMapP);
-#endif
-
        rio_dprintk(RIO_DEBUG_TABLE, "Mapping sysport %d to id %d\n", (int) HostMapP->SysPort, HostMapP->ID);
 
        /*
@@ -784,9 +779,6 @@ struct Map *HostMapP;
 
                rio_dprintk(RIO_DEBUG_TABLE, "c1 p = %p, p->rioPortp = %p\n", p, p->RIOPortp);
                PortP = p->RIOPortp[SysPort];
-#if 0
-               PortP->TtyP = &p->channel[SysPort];
-#endif
                rio_dprintk(RIO_DEBUG_TABLE, "Map port\n");
 
                /*