From d2a44947f99ad44e533713943495a1a3deb5bbcf Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 4 Aug 2008 11:59:05 +0200
Subject: [PATCH] --- yaml --- r: 107922 b: refs/heads/master c:
 62aa0054da220b8bbe6f23c0eb1d97a99005d0b3 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/block/xen-blkfront.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bbf3ee56cf90..3a91008700ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ac0ae062cecd37587f5b951089f90e1d9d91769
+refs/heads/master: 62aa0054da220b8bbe6f23c0eb1d97a99005d0b3
diff --git a/trunk/drivers/block/xen-blkfront.c b/trunk/drivers/block/xen-blkfront.c
index 9ae05c584234..3ca643cafccd 100644
--- a/trunk/drivers/block/xen-blkfront.c
+++ b/trunk/drivers/block/xen-blkfront.c
@@ -154,8 +154,8 @@ static int blkif_getgeo(struct block_device *bd, struct hd_geometry *hg)
 	return 0;
 }
 
-int blkif_ioctl(struct inode *inode, struct file *filep,
-		unsigned command, unsigned long argument)
+static int blkif_ioctl(struct inode *inode, struct file *filep,
+		       unsigned command, unsigned long argument)
 {
 	struct blkfront_info *info =
 		inode->i_bdev->bd_disk->private_data;