From 2b8510e8a3dd27ee1553f6a09399914ba83c0087 Mon Sep 17 00:00:00 2001
From: Krzysztof Wierzbicki <krzysztof.wierzbicki@intel.com>
Date: Mon, 28 Feb 2011 08:27:13 +0100
Subject: [PATCH] --- yaml --- r: 286277 b: refs/heads/master c:
 2ddc4f74d8adcf3e1cdec7f3e72d19b5c878597c h: refs/heads/master i:   286275:
 2a0bc4e194558fb2b4c00bdc2f57da043e166dea v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/nvme.h | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 9ea2582049a9..4a3f7294d07c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b57ab0fada358357571f0eb448cdf2f144785321
+refs/heads/master: 2ddc4f74d8adcf3e1cdec7f3e72d19b5c878597c
diff --git a/trunk/include/linux/nvme.h b/trunk/include/linux/nvme.h
index 757faa71666e..c46a9b7988fb 100644
--- a/trunk/include/linux/nvme.h
+++ b/trunk/include/linux/nvme.h
@@ -199,19 +199,19 @@ enum {
 enum nvme_admin_opcode {
 	nvme_admin_delete_sq		= 0x00,
 	nvme_admin_create_sq		= 0x01,
-	nvme_admin_get_features		= 0x02,
+	nvme_admin_get_log_page		= 0x02,
 	nvme_admin_delete_cq		= 0x04,
 	nvme_admin_create_cq		= 0x05,
 	nvme_admin_identify		= 0x06,
 	nvme_admin_abort_cmd		= 0x08,
 	nvme_admin_set_features		= 0x09,
-	nvme_admin_get_log_page		= 0x0a,
+	nvme_admin_get_features		= 0x0a,
 	nvme_admin_async_event		= 0x0c,
-	nvme_admin_download_fw		= 0x0d,
-	nvme_admin_security_recv	= 0x0e,
-	nvme_admin_format_nvm		= 0x10,
-	nvme_admin_security_send	= 0x11,
-	nvme_admin_activate_fw		= 0x14,
+	nvme_admin_activate_fw		= 0x10,
+	nvme_admin_download_fw		= 0x11,
+	nvme_admin_format_nvm		= 0x80,
+	nvme_admin_security_send	= 0x81,
+	nvme_admin_security_recv	= 0x82,
 };
 
 enum {