From 97612db0727d3c6bb51bcb67dbbc6e95043fad47 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Jan 2009 20:11:44 +0000
Subject: [PATCH] --- yaml --- r: 129855 b: refs/heads/master c:
 7ad489e3d2459f7520d9062cb855ff29a8dd683d h: refs/heads/master i:   129853:
 113a788f0da30e2c25bc290aca8832b4e99e442c   129851:
 13229464d5da9721bcab49688d5afd2cc13fab3a   129847:
 c52ee27718c6013b93d5b82e4e5d3dcea290fa5c   129839:
 60fed1c01233b0c479715c7af227b0ac2b69ccbb   129823:
 0dc7e4fdf4132fc5fec8d821a2c3e4e53789d03e   129791:
 bb48d71eab41f3c4e4c59c44aaf7f774bdcf0e57 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/scsi/ps3rom.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3f6bea69deb4..278d71f96d3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9dad6e598155e2a548142336cd833e5360335d1
+refs/heads/master: 7ad489e3d2459f7520d9062cb855ff29a8dd683d
diff --git a/trunk/drivers/scsi/ps3rom.c b/trunk/drivers/scsi/ps3rom.c
index ce48e2d0193c..ca0dd33497ec 100644
--- a/trunk/drivers/scsi/ps3rom.c
+++ b/trunk/drivers/scsi/ps3rom.c
@@ -290,11 +290,11 @@ static irqreturn_t ps3rom_interrupt(int irq, void *data)
 
 	if (tag != dev->tag)
 		dev_err(&dev->sbd.core,
-			"%s:%u: tag mismatch, got %lx, expected %lx\n",
+			"%s:%u: tag mismatch, got %llx, expected %llx\n",
 			__func__, __LINE__, tag, dev->tag);
 
 	if (res) {
-		dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%lx\n",
+		dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%llx\n",
 			__func__, __LINE__, res, status);
 		return IRQ_HANDLED;
 	}
@@ -364,7 +364,7 @@ static int __devinit ps3rom_probe(struct ps3_system_bus_device *_dev)
 
 	if (dev->blk_size != CD_FRAMESIZE) {
 		dev_err(&dev->sbd.core,
-			"%s:%u: cannot handle block size %lu\n", __func__,
+			"%s:%u: cannot handle block size %llu\n", __func__,
 			__LINE__, dev->blk_size);
 		return -EINVAL;
 	}