From e7aa2dbdb481f1edb1fb920e5c386c73e0916a92 Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Wed, 1 Aug 2012 12:30:26 +0200
Subject: [PATCH] --- yaml --- r: 346236 b: refs/heads/master c:
 232fd3f4a01f45d5402c2e03f7c8815d80bec25b h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/block/drbd/drbd_int.h | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 69cd42845616..5785b2b990da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46e21bbadb2f4770199f2343f311f8833e5bf495
+refs/heads/master: 232fd3f4a01f45d5402c2e03f7c8815d80bec25b
diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h
index eddc4388a1b1..e5c98533c90c 100644
--- a/trunk/drivers/block/drbd/drbd_int.h
+++ b/trunk/drivers/block/drbd/drbd_int.h
@@ -467,12 +467,6 @@ struct p_drbd06_param {
 	u32	  bit_map_gen[5];
 } __packed;
 
-struct p_discard {
-	u64	    block_id;
-	u32	    seq_num;
-	u32	    pad;
-} __packed;
-
 struct p_block_desc {
 	u64 sector;
 	u32 blksize;