From 64e7af1a65f26e5aee4d9ee2ba3fd1abc216afc2 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Sat, 19 Mar 2011 14:55:38 -0400
Subject: [PATCH] --- yaml --- r: 286285 b: refs/heads/master c:
 4948168280b269a514045766ddd872cfac5968e1 h: refs/heads/master i:   286283:
 47a23a114b62ce5af79ac294c250172db92566d6 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/nvme.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e593503205aa..83c522374f91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ecdc946212f7cd592986b2c519b470404caa6b8
+refs/heads/master: 4948168280b269a514045766ddd872cfac5968e1
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index f94f1731478f..d0b52622e261 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -1146,6 +1146,7 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
 static const struct block_device_operations nvme_fops = {
 	.owner		= THIS_MODULE,
 	.ioctl		= nvme_ioctl,
+	.compat_ioctl	= nvme_ioctl,
 };
 
 static void nvme_resubmit_bios(struct nvme_queue *nvmeq)