From f5ed93ee2c7f3d9c3e782eaa5ca3bec31f0e342d Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Mon, 13 Oct 2008 21:39:50 +0200
Subject: [PATCH] --- yaml --- r: 114224 b: refs/heads/master c:
 08243ba731ee08ff42cf1589379c81567690218f h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/ide/ide-cd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c2ea9886cb27..01ef5205a8f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8269e5423387ca0c6f6c75c42dad57c501025d3
+refs/heads/master: 08243ba731ee08ff42cf1589379c81567690218f
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
index 3a08a2ba6b17..3308b1cd3a33 100644
--- a/trunk/drivers/ide/ide-cd.c
+++ b/trunk/drivers/ide/ide-cd.c
@@ -1268,7 +1268,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
 	int xferlen;
 
 	ide_debug_log(IDE_DBG_RQ, "Call %s, rq->cmd_type: 0x%x, block: %llu\n",
-		      __func__, rq->cmd_type, (u64)block);
+		      __func__, rq->cmd_type, (unsigned long long)block);
 
 	if (blk_fs_request(rq)) {
 		if (drive->atapi_flags & IDE_AFLAG_SEEKING) {