From 9e028ff32259d263bb8a6d3312ef117aaf0d0d78 Mon Sep 17 00:00:00 2001
From: Michal Nazarewicz <mina86@mina86.com>
Date: Mon, 18 Jun 2012 14:37:19 +0200
Subject: [PATCH] --- yaml --- r: 316917 b: refs/heads/master c:
 f87cabf4d56e1fc5d08434df9d54ef3450a756f0 h: refs/heads/master i:   316915:
 953edc0d988057a5ff1a3d938870fed0e697ea97 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/usb/gadget/storage_common.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 839b4f9b1a1f..b835ba4a8594 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f47209b271661ecd5929397cbe646ff247f01b6
+refs/heads/master: f87cabf4d56e1fc5d08434df9d54ef3450a756f0
diff --git a/trunk/drivers/usb/gadget/storage_common.c b/trunk/drivers/usb/gadget/storage_common.c
index 8081ca3a70a2..8a8157f96a2d 100644
--- a/trunk/drivers/usb/gadget/storage_common.c
+++ b/trunk/drivers/usb/gadget/storage_common.c
@@ -37,12 +37,6 @@
  * When FSG_NO_OTG is defined fsg_otg_desc won't be defined.
  */
 
-/*
- * When FSG_BUFFHD_STATIC_BUFFER is defined when this file is included
- * the fsg_buffhd structure's buf field will be an array of FSG_BUFLEN
- * characters rather then a pointer to void.
- */
-
 /*
  * When USB_GADGET_DEBUG_FILES is defined the module param num_buffers
  * sets the number of pipeline buffers (length of the fsg_buffhd array).
@@ -260,11 +254,7 @@ enum fsg_buffer_state {
 };
 
 struct fsg_buffhd {
-#ifdef FSG_BUFFHD_STATIC_BUFFER
-	char				buf[FSG_BUFLEN];
-#else
 	void				*buf;
-#endif
 	enum fsg_buffer_state		state;
 	struct fsg_buffhd		*next;