diff --git a/[refs] b/[refs]
index f4947285f67c..6fbfda2ac30a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a84a505956f5c795a9ab3d60d97b6b91a27aa571
+refs/heads/master: 68f66feb300423bb9ee5daecb1951af394425a38
diff --git a/trunk/drivers/block/ioctl.c b/trunk/drivers/block/ioctl.c
index 5e03f5157ef9..6d7bcc9da9e7 100644
--- a/trunk/drivers/block/ioctl.c
+++ b/trunk/drivers/block/ioctl.c
@@ -237,3 +237,5 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 	}
 	return ret;
 }
+
+EXPORT_SYMBOL_GPL(blkdev_ioctl);
diff --git a/trunk/drivers/char/raw.c b/trunk/drivers/char/raw.c
index a2e33ec79615..131465e8de5a 100644
--- a/trunk/drivers/char/raw.c
+++ b/trunk/drivers/char/raw.c
@@ -122,7 +122,7 @@ raw_ioctl(struct inode *inode, struct file *filp,
 {
 	struct block_device *bdev = filp->private_data;
 
-	return ioctl_by_bdev(bdev, command, arg);
+	return blkdev_ioctl(bdev->bd_inode, filp, command, arg);
 }
 
 static void bind_device(struct raw_config_request *rq)