Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / udc / net2280.h

diff --git a/drivers/usb/gadget/udc/net2280.h b/drivers/usb/gadget/udc/net2280.h
index ac8d5a20a378a9de074901b8667bb721f8e86cdc..4dff60d34f732097752e59360e0edcf7e5eb90b4 100644 (file)
--- a/drivers/usb/gadget/udc/net2280.h
+++ b/drivers/usb/gadget/udc/net2280.h
@@ -96,7 +96,6 @@ struct net2280_ep {
        struct net2280_ep_regs                  __iomem *regs;
        struct net2280_dma_regs                 __iomem *dma;
        struct net2280_dma                      *dummy;
-       struct usb338x_fifo_regs __iomem *fiforegs;
        dma_addr_t                              td_dma; /* of dummy */
        struct net2280                          *dev;
        unsigned long                           irqs;
@@ -181,7 +180,6 @@ struct net2280 {
        struct net2280_dma_regs         __iomem *dma;
        struct net2280_dep_regs         __iomem *dep;
        struct net2280_ep_regs          __iomem *epregs;
-       struct usb338x_fifo_regs        __iomem *fiforegs;
        struct usb338x_ll_regs          __iomem *llregs;
        struct usb338x_ll_lfps_regs     __iomem *ll_lfps_regs;
        struct usb338x_ll_tsn_regs      __iomem *ll_tsn_regs;