Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

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

diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c
index 204267613c9ca4796a30ac0455ac75d94b9ca485..a4f0b1e3e7fabf105892d9c2d442e8cc066d7147 100644 (file)
--- a/drivers/char/rio/riotty.c
+++ b/drivers/char/rio/riotty.c
@@ -576,7 +576,7 @@ static void RIOClearUp(struct Port *PortP)
 */
 int RIOShortCommand(struct rio_info *p, struct Port *PortP, int command, int len, int arg)
 {
-       struct PKT *PacketP;
+       struct PKT __iomem *PacketP;
        int retries = 20;       /* at 10 per second -> 2 seconds */
        unsigned long flags;