Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

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

diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c
index 4810b845cc21074f49fc72aba3c0e7aa5637bee6..d687c17be15247343b9f0fd0c4f2882a8ae6f089 100644 (file)
--- a/drivers/char/rio/rioparam.c
+++ b/drivers/char/rio/rioparam.c
@@ -30,10 +30,6 @@
 ** -----------------------------------------------------------------------------
 */
 
-#ifdef SCCS_LABELS
-static char *_rioparam_c_sccs_ = "@(#)rioparam.c       1.3";
-#endif
-
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
@@ -164,7 +160,7 @@ int RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag)
 
        func_enter();
 
-       TtyP = PortP->gs.tty;
+       TtyP = PortP->gs.port.tty;
 
        rio_dprintk(RIO_DEBUG_PARAM, "RIOParam: Port:%d cmd:%d Modem:%d SleepFlag:%d Mapped: %d, tty=%p\n", PortP->PortNum, cmd, Modem, SleepFlag, PortP->Mapped, TtyP);