Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / usb / gadget / langwell_udc.h

diff --git a/drivers/usb/gadget/langwell_udc.h b/drivers/usb/gadget/langwell_udc.h
index 9719934e1c0830fc692e5e929dda5bc2b5835008..f1d9c1bb04f324b8e717620dc8815210ce3bdced 100644 (file)
--- a/drivers/usb/gadget/langwell_udc.h
+++ b/drivers/usb/gadget/langwell_udc.h
@@ -18,11 +18,7 @@
  */
 
 #include <linux/usb/langwell_udc.h>
-
-#if defined(CONFIG_USB_LANGWELL_OTG)
 #include <linux/usb/langwell_otg.h>
-#endif
-
 
 /*-------------------------------------------------------------------------*/
 
@@ -199,7 +195,9 @@ struct langwell_udc {
                                vbus_active:1,
                                suspended:1,
                                stopped:1,
-                               lpm:1;  /* LPM capability */
+                               lpm:1,          /* LPM capability */
+                               has_sram:1,     /* SRAM caching */
+                               got_sram:1;
 
        /* pci state used to access those endpoints */
        struct pci_dev          *pdev;
@@ -224,5 +222,12 @@ struct langwell_udc {
 
        /* make sure release() is done */
        struct completion       *done;
+
+       /* for private SRAM caching */
+       unsigned int            sram_addr;
+       unsigned int            sram_size;
+
+       /* device status data for get_status request */
+       u16                     dev_status;
 };