diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h
index 839f3a6c88c6..fe4b2dddace2 100644
--- a/drivers/staging/greybus/greybus_protocols.h
+++ b/drivers/staging/greybus/greybus_protocols.h
@@ -58,6 +58,15 @@
 #define GB_CONTROL_BUNDLE_ID			0
 #define GB_CONTROL_CPORT_ID			2
 
+
+/* version request has no payload */
+struct gb_protocol_version_response {
+	__u8	major;
+	__u8	minor;
+};
+
+/* Control Protocol */
+
 /* Version of the Greybus control protocol we support */
 #define GB_CONTROL_VERSION_MAJOR		0x00
 #define GB_CONTROL_VERSION_MINOR		0x01
diff --git a/drivers/staging/greybus/protocol.h b/drivers/staging/greybus/protocol.h
index 3f226e3bbe06..758b36ef1f55 100644
--- a/drivers/staging/greybus/protocol.h
+++ b/drivers/staging/greybus/protocol.h
@@ -13,12 +13,6 @@
 struct gb_connection;
 struct gb_operation;
 
-/* version request has no payload */
-struct gb_protocol_version_response {
-	__u8	major;
-	__u8	minor;
-};
-
 typedef int (*gb_connection_init_t)(struct gb_connection *);
 typedef void (*gb_connection_exit_t)(struct gb_connection *);
 typedef int (*gb_request_recv_t)(u8, struct gb_operation *);