Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[~andy/linux] / include / linux / fsl_devices.h

diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index d5f9a7431bd0516da252d0ca316fde7a63cbbf9e..4eb56ed75fbceec07dce3a92cbd5a81b9c150a78 100644 (file)
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -66,6 +66,7 @@ struct fsl_usb2_platform_data {
        enum fsl_usb2_operating_modes   operating_mode;
        enum fsl_usb2_phy_modes         phy_mode;
        unsigned int                    port_enables;
+       unsigned int                    workaround;
 
        int             (*init)(struct platform_device *);
        void            (*exit)(struct platform_device *);
@@ -84,6 +85,8 @@ struct fsl_usb2_platform_data {
 #define FSL_USB2_PORT0_ENABLED 0x00000001
 #define FSL_USB2_PORT1_ENABLED 0x00000002
 
+#define FLS_USB2_WORKAROUND_ENGCM09152 (1 << 0)
+
 struct spi_device;
 
 struct fsl_spi_platform_data {