From 4d2869d8bac0d7b8889c603f781ee9415626e75e Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Fri, 6 May 2011 08:37:54 -0400
Subject: [PATCH] --- yaml --- r: 286295 b: refs/heads/master c:
 fd63e9ceeeae58cfe877c2d49d41c1bf7532303c h: refs/heads/master i:   286293:
 e824233aadf55d8c7a6e9638737fa369c56e9474   286291:
 b3a130d6312d28f9cb0697a4e009ec4d9d60a4d8   286287:
 c1fabb3a91298a098b39c43b121bec912f2d98b5 v: v3

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

diff --git a/[refs] b/[refs]
index 06c0b7fc486d..8f94cc23c4db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8de055350fbaa96b6563892c195a60be583faa9c
+refs/heads/master: fd63e9ceeeae58cfe877c2d49d41c1bf7532303c
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index 9c0ab2af0fae..b285a7e0624d 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -20,6 +20,7 @@
 #include <linux/bio.h>
 #include <linux/bitops.h>
 #include <linux/blkdev.h>
+#include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/genhd.h>