From d594befaa391c836adbc269a060b17d097f944ad Mon Sep 17 00:00:00 2001
From: Ed Cashin <ecashin@coraid.com>
Date: Thu, 4 Oct 2012 17:16:47 -0700
Subject: [PATCH] --- yaml --- r: 330196 b: refs/heads/master c:
 1ac9e602625817b0c16cc70ea496875f7bd58a4d h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/block/aoe/aoe.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 604b292797ff..2ae7c326fc53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08b60623510aebddd9ac4bf61dbe2d39313dddfd
+refs/heads/master: 1ac9e602625817b0c16cc70ea496875f7bd58a4d
diff --git a/trunk/drivers/block/aoe/aoe.h b/trunk/drivers/block/aoe/aoe.h
index 4ae2468b4a06..c2bf79791e35 100644
--- a/trunk/drivers/block/aoe/aoe.h
+++ b/trunk/drivers/block/aoe/aoe.h
@@ -10,9 +10,6 @@
 #define AOE_PARTITIONS (16)
 #endif
 
-#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * NPERSHELF + (aoeminor))
-#define AOEMAJOR(sysminor) ((sysminor) / NPERSHELF)
-#define AOEMINOR(sysminor) ((sysminor) % NPERSHELF)
 #define WHITESPACE " \t\v\f\n"
 
 enum {
@@ -82,7 +79,6 @@ enum {
 
 enum {
 	DEFAULTBCNT = 2 * 512,	/* 2 sectors */
-	NPERSHELF = 16,		/* number of slots per shelf address */
 	MIN_BUFS = 16,
 	NTARGETS = 8,
 	NAOEIFS = 8,