diff --git a/[refs] b/[refs]
index dcaa878498c3..53287005cf6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17200811cf539b9107a99a39bf71ba3567966285
+refs/heads/master: 5f0212174db33828f8bddcff501b73d2bc734f72
diff --git a/trunk/drivers/net/irda/irport.c b/trunk/drivers/net/irda/irport.c
index 3098960dc2a1..3078c419cb02 100644
--- a/trunk/drivers/net/irda/irport.c
+++ b/trunk/drivers/net/irda/irport.c
@@ -509,7 +509,7 @@ static void irport_timeout(struct net_device *dev)
 	IRDA_DEBUG(0, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n", 
 		   __FUNCTION__, iir, lsr, iobase);
 
-	IRDA_DEBUG(0, "%s(), transmitting=%d, remain=%d, done=%d\n", 
+	IRDA_DEBUG(0, "%s(), transmitting=%d, remain=%d, done=%td\n",
 		   __FUNCTION__, self->transmitting, self->tx_buff.len,
 		   self->tx_buff.data - self->tx_buff.head);