diff --git a/[refs] b/[refs]
index 5ef57e1b51d4..37d093328c54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f404e9a67ffdc0bb0302a5ad1f7eaf58e5a59109
+refs/heads/master: 64af4c13622511257daba762b32d9d20f2d0c4b5
diff --git a/trunk/drivers/net/cassini.c b/trunk/drivers/net/cassini.c
index 1f7ca453bb4a..dde631f8f685 100644
--- a/trunk/drivers/net/cassini.c
+++ b/trunk/drivers/net/cassini.c
@@ -1925,8 +1925,8 @@ static void cas_tx(struct net_device *dev, struct cas *cp,
 	u64 compwb = le64_to_cpu(cp->init_block->tx_compwb);
 #endif
 	if (netif_msg_intr(cp))
-		printk(KERN_DEBUG "%s: tx interrupt, status: 0x%x, %lx\n",
-			cp->dev->name, status, compwb);
+		printk(KERN_DEBUG "%s: tx interrupt, status: 0x%x, %llx\n",
+			cp->dev->name, status, (unsigned long long)compwb);
 	/* process all the rings */
 	for (ring = 0; ring < N_TX_RINGS; ring++) {
 #ifdef USE_TX_COMPWB