Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[karo-tx-linux.git] / drivers / usb / gadget / legacy / tcm_usb_gadget.h

diff --git a/drivers/usb/gadget/legacy/tcm_usb_gadget.h b/drivers/usb/gadget/legacy/tcm_usb_gadget.h
index 9fb3544cc80f088d547d264945944043508418e3..0b749e1aa2f10e56ac667c19145f09446627ad66 100644 (file)
--- a/drivers/usb/gadget/legacy/tcm_usb_gadget.h
+++ b/drivers/usb/gadget/legacy/tcm_usb_gadget.h
@@ -24,15 +24,6 @@ enum {
 #define USB_G_ALT_INT_BBB       0
 #define USB_G_ALT_INT_UAS       1
 
-struct usbg_nacl {
-       /* Binary World Wide unique Port Name for SAS Initiator port */
-       u64 iport_wwpn;
-       /* ASCII formatted WWPN for Sas Initiator port */
-       char iport_name[USBG_NAMELEN];
-       /* Returned by usbg_make_nodeacl() */
-       struct se_node_acl se_node_acl;
-};
-
 struct tcm_usbg_nexus {
        struct se_session *tvn_se_sess;
 };
@@ -52,8 +43,6 @@ struct usbg_tpg {
 };
 
 struct usbg_tport {
-       /* SCSI protocol the tport is providing */
-       u8 tport_proto_id;
        /* Binary World Wide unique Port Name for SAS Target port */
        u64 tport_wwpn;
        /* ASCII formatted WWPN for SAS Target port */